Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 54862: [CMAKE] add _PREFAST_ option for amd64, too
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:05:25 2012 New Revision: 54862 URL: http://svn.reactos.org/svn/reactos?rev=54862&view=rev Log: [CMAKE] add _PREFAST_ option for amd64, too Modified: trunk/reactos/cmake/config-amd64.cmake Modified: trunk/reactos/cmake/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-amd64.cmake?r… ============================================================================== --- trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] Sat Jan 7 16:05:25 2012 @@ -41,3 +41,8 @@ set(USERMODE TRUE CACHE BOOL "Whether to compile any usermode parts. This is while kernel mode is under heavy development and usermode part not relevant for bootcd.") + +if(MSVC) +set(_PREFAST_ FALSE CACHE BOOL +"Whether to enable PREFAST while compiling.") +endif()

1 0

[janderwald] 54861: [WDMAUD] - Improve error check
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:42:53 2012 New Revision: 54861 URL: http://svn.reactos.org/svn/reactos?rev=54861&view=rev Log: [WDMAUD] - Improve error check Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sat Jan 7 15:42:53 2012 @@ -334,7 +334,7 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - if (!IoStack->FileObject) + if (!IoStack->FileObject || !IoStack->FileObject->FsContext) { /* file object parameter */ DPRINT1("Error: file object is not attached\n");

1 0

[janderwald] 54860: [SHELL32] - Check if querying shell details failed
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:40:27 2012 New Revision: 54860 URL: http://svn.reactos.org/svn/reactos?rev=54860&view=rev Log: [SHELL32] - Check if querying shell details failed Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Jan 7 15:40:27 2012 @@ -1682,7 +1682,12 @@ if (pSF2Parent) { SHELLDETAILS sd; - pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd); + if (FAILED(pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd))) + { + FIXME("failed to get details\n"); + break; + } + if (lpnmh->code == LVN_GETDISPINFOA) { /* shouldn't happen */

1 0

[janderwald] 54859: [USB-BRINGUP] - Sync obname.c with trunk - Implement ObIsDosDeviceLocallyMapped function
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:39:22 2012 New Revision: 54859 URL: http://svn.reactos.org/svn/reactos?rev=54859&view=rev Log: [USB-BRINGUP] - Sync obname.c with trunk - Implement ObIsDosDeviceLocallyMapped function Modified: branches/usb-bringup/ntoskrnl/ob/obname.c Modified: branches/usb-bringup/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/ntoskrnl/ob/obname.… ============================================================================== --- branches/usb-bringup/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ branches/usb-bringup/ntoskrnl/ob/obname.c [iso-8859-1] Sat Jan 7 15:39:22 2012 @@ -113,24 +113,28 @@ NTAPI ObDereferenceDeviceMap(IN PEPROCESS Process) { - //KIRQL OldIrql; - PDEVICE_MAP DeviceMap = Process->DeviceMap; - - /* FIXME: We don't use Process Devicemaps yet */ + PDEVICE_MAP DeviceMap; + + /* Get the pointer to this process devicemap and reset it + holding devicemap lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + DeviceMap = Process->DeviceMap; + Process->DeviceMap = NULL; + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* Continue only if there is a devicemap to dereference */ if (DeviceMap) { - /* FIXME: Acquire the DeviceMap Spinlock */ - // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql); + KeAcquireGuardedMutex(&ObpDeviceMapLock); /* Delete the device map link and dereference it */ - Process->DeviceMap = NULL; if (--DeviceMap->ReferenceCount) { /* Nobody is referencing it anymore, unlink the DOS directory */ DeviceMap->DosDevicesDirectory->DeviceMap = NULL; - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); /* Dereference the DOS Devices Directory and free the Device Map */ ObDereferenceObject(DeviceMap->DosDevicesDirectory); @@ -138,8 +142,8 @@ } else { - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); } } } @@ -540,7 +544,7 @@ } /* Reparse */ - while (Reparse) + while (Reparse && MaxReparse) { /* Get the name */ RemainingName = *ObjectName; @@ -690,7 +694,7 @@ ObjectHeader))) { /* Either couldn't allocate the name, or insert failed */ - if (NewName) ExFreePool(NewName); + if (NewName) ExFreePoolWithTag(NewName, OB_NAME_TAG); /* Fail due to memory reasons */ Status = STATUS_INSUFFICIENT_RESOURCES; @@ -791,6 +795,7 @@ { /* Reparse again */ Reparse = TRUE; + --MaxReparse; /* Start over from root if we got sent back there */ if ((Status == STATUS_REPARSE_OBJECT) || @@ -981,6 +986,7 @@ ULONG NameSize; PWCH ObjectName; BOOLEAN ObjectIsNamed; + NTSTATUS Status = STATUS_SUCCESS; /* Get the Kernel Meta-Structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -989,28 +995,57 @@ /* Check if a Query Name Procedure is available */ if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) { - /* Call the procedure */ + /* Call the procedure inside SEH */ ObjectIsNamed = ((LocalInfo) && (LocalInfo->Name.Length > 0)); - return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + + _SEH2_TRY + { + Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, ObjectIsNamed, ObjectNameInfo, Length, ReturnLength, KernelMode); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* Check if the object doesn't even have a name */ if (!(LocalInfo) || !(LocalInfo->Name.Buffer)) { - /* We're returning the name structure */ - *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* Return an empty buffer */ - RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* We're returning the name structure */ + *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + /* Return an empty buffer */ + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* @@ -1020,123 +1055,136 @@ * enough right at the beginning, not work our way through * and find out at the end */ - if (Object == ObpRootDirectoryObject) - { - /* Size of the '\' string */ - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); - } - else - { - /* Get the Object Directory and add name of Object */ - ParentDirectory = LocalInfo->Directory; - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; - - /* Loop inside the directory to get the top-most one (meaning root) */ - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the Name Information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the size of the Directory Name */ - if (LocalInfo && LocalInfo->Directory) - { - /* Size of the '\' string + Directory Name */ - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + - LocalInfo->Name.Length; - - /* Move to next parent Directory */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory with no name. We append "...\" */ - NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); - break; - } - } - } - - /* Finally, add the name of the structure and the null char */ - *ReturnLength = NameSize + - sizeof(OBJECT_NAME_INFORMATION) + - sizeof(UNICODE_NULL); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* - * Now we will actually create the name. We work backwards because - * it's easier to start off from the Name we have and walk up the - * parent directories. We use the same logic as Name Length calculation. - */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); - *--ObjectName = UNICODE_NULL; - - /* Check if the object is actually the Root directory */ - if (Object == ObpRootDirectoryObject) - { - /* This is already the Root Directory, return "\\" */ - *--ObjectName = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - return STATUS_SUCCESS; - } - else - { - /* Start by adding the Object's Name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Now parse the Parent directories until we reach the top */ - ParentDirectory = LocalInfo->Directory; - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the name information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the "\" */ + _SEH2_TRY + { + if (Object == ObpRootDirectoryObject) + { + /* Size of the '\' string */ + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); + } + else + { + /* Get the Object Directory and add name of Object */ + ParentDirectory = LocalInfo->Directory; + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; + + /* Loop inside the directory to get the top-most one (meaning root) */ + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the Name Information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the size of the Directory Name */ + if (LocalInfo && LocalInfo->Directory) + { + /* Size of the '\' string + Directory Name */ + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + + LocalInfo->Name.Length; + + /* Move to next parent Directory */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory with no name. We append "...\" */ + NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); + break; + } + } + } + + /* Finally, add the name of the structure and the null char */ + *ReturnLength = NameSize + + sizeof(OBJECT_NAME_INFORMATION) + + sizeof(UNICODE_NULL); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); + + /* + * Now we will actually create the name. We work backwards because + * it's easier to start off from the Name we have and walk up the + * parent directories. We use the same logic as Name Length calculation. + */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); + *--ObjectName = UNICODE_NULL; + + /* Check if the object is actually the Root directory */ + if (Object == ObpRootDirectoryObject) + { + /* This is already the Root Directory, return "\\" */ + *--ObjectName = OBJ_NAME_PATH_SEPARATOR; + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + _SEH2_YIELD(return STATUS_SUCCESS); + } + else + { + /* Start by adding the Object's Name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Now parse the Parent directories until we reach the top */ + ParentDirectory = LocalInfo->Directory; + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the name information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the "\" */ + *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; + + /* Add the Parent Directory's Name */ + if (LocalInfo && LocalInfo->Name.Buffer) + { + /* Add the name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Move to next parent */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory without a name, we add "..." */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + sizeof(L"...") + + sizeof(UNICODE_NULL)); + RtlCopyMemory(ObjectName, + L"...", + sizeof(L"...") + sizeof(UNICODE_NULL)); + break; + } + } + + /* Add Root Directory Name */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - - /* Add the Parent Directory's Name */ - if (LocalInfo && LocalInfo->Name.Buffer) - { - /* Add the name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Move to next parent */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory without a name, we add "..." */ - ObjectName -= sizeof(L"..."); - ObjectName = L"..."; - break; - } - } - - /* Add Root Directory Name */ - *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - } + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = + (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Return success */ - return STATUS_SUCCESS; + return Status; } VOID @@ -1144,15 +1192,12 @@ ObQueryDeviceMapInformation(IN PEPROCESS Process, IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo) { - //KIRQL OldIrql ; - /* * FIXME: This is an ugly hack for now, to always return the System Device Map * instead of returning the Process Device Map. Not important yet since we don't use it */ - /* FIXME: Acquire the DeviceMap Spinlock */ - // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql); + KeAcquireGuardedMutex(&ObpDeviceMapLock); /* Make a copy */ DeviceMapInfo->Query.DriveMap = ObSystemDeviceMap->DriveMap; @@ -1160,8 +1205,33 @@ ObSystemDeviceMap->DriveType, sizeof(ObSystemDeviceMap->DriveType)); - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + KeReleaseGuardedMutex(&ObpDeviceMapLock); } +NTSTATUS +NTAPI +ObIsDosDeviceLocallyMapped( + IN ULONG Index, + OUT PUCHAR DosDeviceState) +{ + /* check parameters */ + if (Index < 1 || Index > 26) + { + /* invalid index */ + return STATUS_INVALID_PARAMETER; + } + + /* acquire lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* get drive mapping status */ + *DosDeviceState = (ObSystemDeviceMap->DriveMap & (1 << Index)) != 0; + + /* release lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* done */ + return STATUS_SUCCESS; +} + /* EOF */

1 0

[janderwald] 54858: [USB-BRINGUP] - Partly implement HidP_TranslateUsageAndPagesToI8042ScanCodes - Needs key modifier state function to work correctly - KBDHID should now receive translated keys (w...
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 10:24:10 2012 New Revision: 54858 URL: http://svn.reactos.org/svn/reactos?rev=54858&view=rev Log: [USB-BRINGUP] - Partly implement HidP_TranslateUsageAndPagesToI8042ScanCodes - Needs key modifier state function to work correctly - KBDHID should now receive translated keys (without key modifiers) Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.c branches/usb-bringup/lib/drivers/hidparser/api.c branches/usb-bringup/lib/drivers/hidparser/hidparser.c branches/usb-bringup/lib/drivers/hidparser/hidparser.h Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidpars… ============================================================================== --- branches/usb-bringup/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -322,6 +322,37 @@ HIDAPI NTSTATUS NTAPI +HidP_TranslateUsageAndPagesToI8042ScanCodes( + IN PUSAGE_AND_PAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + HID_PARSER Parser; + + // + // sanity check + // + ASSERT(ReportType == HidP_Input || ReportType == HidP_Output || ReportType == HidP_Feature); + + // + // init parser + // + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); + + // + // translate usage pages + // + return HidParser_TranslateUsageAndPagesToI8042ScanCodes(Parser, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); +} + + + +HIDAPI +NTSTATUS +NTAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, @@ -491,22 +522,6 @@ HIDAPI NTSTATUS NTAPI -HidP_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI HidP_SetUsages( IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, Modified: branches/usb-bringup/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -11,6 +11,27 @@ #include "parser.h" +static ULONG KeyboardScanCodes[256] = +{ + 0, 0, 0, 0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, + 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 28, 1, 14, 15, 57, 12, 13, 26, + 27, 43, 43, 39, 40, 41, 51, 52, 53, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 87, 88, 99, 70,119,110,102,104,111,107,109,106, + 105,108,103, 69, 98, 55, 74, 78, 96, 79, 80, 81, 75, 76, 77, 71, + 72, 73, 82, 83, 86,127,116,117,183,184,185,186,187,188,189,190, + 191,192,193,194,134,138,130,132,128,129,131,137,133,135,136,113, + 115,114, 0, 0, 0,121, 0, 89, 93,124, 92, 94, 95, 0, 0, 0, + 122,123, 90, 91, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113, + 150,158,159,128,136,177,178,176,142,152,173,140 +}; + + ULONG HidParser_NumberOfTopCollections( @@ -951,3 +972,106 @@ // return HIDPARSER_STATUS_USAGE_NOT_FOUND; } + +ULONG +HidParser_GetScanCode( + IN USAGE Usage) +{ + if (Usage < sizeof(KeyboardScanCodes) / sizeof(KeyboardScanCodes[0])) + { + // + // valid usage + // + return KeyboardScanCodes[Usage]; + } + + // + // invalid usage + // + return 0; +} + +VOID +HidParser_DispatchKey( + IN PCHAR ScanCodes, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG Index; + ULONG Length = 0; + + // + // count code length + // + for(Index = 0; Index < sizeof(ULONG); Index++) + { + if (ScanCodes[Index] == 0) + { + // + // last scan code + // + break; + } + + // + // is this a key break + // + if (KeyAction == HidP_KeyboardBreak) + { + // + // add break + // + ScanCodes[Index] |= KEY_BREAK; + } + + // + // more scan counts + // + Length++; + } + + if (Length > 0) + { + // + // dispatch scan codes + // + InsertCodesProcedure(InsertCodesContext, ScanCodes, Length); + } +} + + +HIDPARSER_STATUS +HidParser_TranslateUsage( + IN PHID_PARSER Parser, + IN USAGE Usage, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG ScanCode; + + // + // get scan code + // + ScanCode = HidParser_GetScanCode(Usage); + if (!ScanCode) + { + // + // invalid lookup or no scan code available + // + return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN; + } + + // + // FIXME: translate modifier states + // + + HidParser_DispatchKey((PCHAR)&ScanCode, KeyAction, InsertCodesProcedure, InsertCodesContext); + + // + // done + // + return HIDPARSER_STATUS_SUCCESS; +} Modified: branches/usb-bringup/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -14,8 +14,29 @@ TranslateHidParserStatus( IN HIDPARSER_STATUS Status) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + switch(Status) + { + case HIDPARSER_STATUS_INSUFFICIENT_RESOURCES: + return HIDP_STATUS_INTERNAL_ERROR; + case HIDPARSER_STATUS_NOT_IMPLEMENTED: + return HIDP_STATUS_NOT_IMPLEMENTED; + case HIDPARSER_STATUS_REPORT_NOT_FOUND: + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + case HIDPARSER_STATUS_INVALID_REPORT_LENGTH: + return HIDP_STATUS_INVALID_REPORT_LENGTH; + case HIDPARSER_STATUS_INVALID_REPORT_TYPE: + return HIDP_STATUS_INVALID_REPORT_TYPE; + case HIDPARSER_STATUS_BUFFER_TOO_SMALL: + return HIDP_STATUS_BUFFER_TOO_SMALL; + case HIDPARSER_STATUS_USAGE_NOT_FOUND: + return HIDP_STATUS_USAGE_NOT_FOUND; + case HIDPARSER_STATUS_I8042_TRANS_UNKNOWN: + return HIDP_STATUS_I8042_TRANS_UNKNOWN; + case HIDPARSER_STATUS_COLLECTION_NOT_FOUND: + return HIDP_STATUS_NOT_IMPLEMENTED; //FIXME + } + DPRINT1("TranslateHidParserStatus Status %ld not implemented\n", Status); + return HIDP_STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -631,6 +652,77 @@ // return TranslateHidParserStatus(ParserStatus); } + +HIDAPI +NTSTATUS +NTAPI +HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, + IN PUSAGE_AND_PAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG Index; + HIDPARSER_STATUS Status = HIDPARSER_STATUS_SUCCESS; + + for(Index = 0; Index < UsageListLength; Index++) + { + // + // check current usage + // + if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_KEYBOARD) + { + // + // process usage + // + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + } + else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) + { + // + // FIXME: implement me + // + UNIMPLEMENTED + Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; + } + else + { + // + // invalid page + // + DPRINT1("[HIDPARSE] Error unexpected usage page %x\n", ChangedUsageList[Index].UsagePage); + return HIDP_STATUS_I8042_TRANS_UNKNOWN; + } + + // + // check status + // + if (Status != HIDPARSER_STATUS_SUCCESS) + { + // + // failed + // + return TranslateHidParserStatus(Status); + } + } + + if (Status != HIDPARSER_STATUS_SUCCESS) + { + // + // failed + // + return TranslateHidParserStatus(Status); + } + + // + // done + // + return HIDP_STATUS_SUCCESS; +} + HIDAPI NTSTATUS @@ -937,22 +1029,6 @@ HIDAPI NTSTATUS NTAPI -HidParser_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI HidParser_SetUsages( IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, Modified: branches/usb-bringup/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -44,7 +44,8 @@ HIDPARSER_STATUS_INVALID_REPORT_LENGTH = -5, HIDPARSER_STATUS_INVALID_REPORT_TYPE = -6, HIDPARSER_STATUS_BUFFER_TOO_SMALL = -7, - HIDPARSER_STATUS_USAGE_NOT_FOUND = 8 + HIDPARSER_STATUS_USAGE_NOT_FOUND = -8, + HIDPARSER_STATUS_I8042_TRANS_UNKNOWN = -9 }HIDPARSER_STATUS_CODES; typedef struct

1 0

[cgutman] 54857: [HIVESYS] - Add an entry for ndisuio (temporary until INF install works) - Autostart WZC service [NDISUIO] - Fix crash during binding and receive - Add more debugging
by cgutman＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: cgutman Date: Sat Jan 7 05:54:14 2012 New Revision: 54857 URL: http://svn.reactos.org/svn/reactos?rev=54857&view=rev Log: [HIVESYS] - Add an entry for ndisuio (temporary until INF install works) - Autostart WZC service [NDISUIO] - Fix crash during binding and receive - Add more debugging Modified: branches/wlan-bringup/boot/bootdata/hivesys_i386.inf branches/wlan-bringup/drivers/network/ndisuio/createclose.c branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/main.c branches/wlan-bringup/drivers/network/ndisuio/protocol.c Modified: branches/wlan-bringup/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/boot/bootdata/hive… ============================================================================== --- branches/wlan-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/wlan-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 7 05:54:14 2012 @@ -1398,6 +1398,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system32\drivers\nmidebug.sys" HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001 + +; NDIS User I/O driver (FIXME: Should be installed via INF and started on demand) +HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Group",0x00000000,"NDIS" +HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ImagePath",0x00020000,"system32\drivers\ndisuio.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Type",0x00010001,0x00000001 ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001 @@ -1629,7 +1636,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Group",0x00000000,"TDI" HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ImagePath",0x00020000,"%SystemRoot%\system32\wlansvc.exe" HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Type",0x00010001,0x00000110 ; Simple TCP services Modified: branches/wlan-bringup/drivers/network/ndisuio/createclose.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] Sat Jan 7 05:54:14 2012 @@ -8,7 +8,7 @@ #include "ndisuio.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> NTSTATUS @@ -19,6 +19,8 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceObject == GlobalDeviceObject); + + DPRINT("Created file object 0x%x\n", IrpSp->FileObject); /* This is associated with an adapter during IOCTL_NDISUIO_OPEN_(WRITE_)DEVICE */ IrpSp->FileObject->FsContext = NULL; @@ -43,11 +45,15 @@ PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; ASSERT(DeviceObject == GlobalDeviceObject); + + DPRINT("Closing file object 0x%x\n", IrpSp->FileObject); /* Check if this handle was ever associated with an adapter */ if (AdapterContext != NULL) { ASSERT(OpenEntry != NULL); + + DPRINT("Removing binding to adapter %wZ\n", &AdapterContext->DeviceName); /* Call the our helper */ DereferenceAdapterContextWithOpenEntry(AdapterContext, OpenEntry); Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Sat Jan 7 05:54:14 2012 @@ -8,7 +8,7 @@ #include "ndisuio.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> static @@ -57,6 +57,7 @@ if (i == QueryBinding->BindingIndex) { AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); + DPRINT("Query binding for index %d is adapter %wZ\n", i, &AdapterContext->DeviceName); if (AdapterContext->DeviceName.Length <= QueryBinding->DeviceNameLength) { BytesCopied += AdapterContext->DeviceName.Length; @@ -155,6 +156,8 @@ Request.DATA.SET_INFORMATION.Oid = SetOidRequest->Oid; Request.DATA.SET_INFORMATION.InformationBuffer = SetOidRequest->Data; Request.DATA.SET_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + DPRINT("Setting OID 0x%x on adapter %wZ\n", SetOidRequest->Oid, &AdapterContext->DeviceName); /* Dispatch the request */ NdisRequest(&Status, @@ -209,6 +212,8 @@ Request.DATA.QUERY_INFORMATION.Oid = QueryOidRequest->Oid; Request.DATA.QUERY_INFORMATION.InformationBuffer = QueryOidRequest->Data; Request.DATA.QUERY_INFORMATION.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + DPRINT("Querying OID 0x%x on adapter %wZ\n", QueryOidRequest->Oid, &AdapterContext->DeviceName); /* Dispatch the request */ NdisRequest(&Status, @@ -264,6 +269,8 @@ AdapterContext = FindAdapterContextByName(&DeviceName); if (AdapterContext != NULL) { + DPRINT("Binding file object 0x%x to device %wZ\n", FileObject, &AdapterContext->DeviceName); + /* Reference the adapter context */ KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); if (AdapterContext->OpenCount != 0) Modified: branches/wlan-bringup/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] Sat Jan 7 05:54:14 2012 @@ -8,7 +8,7 @@ #include "ndisuio.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> PDEVICE_OBJECT GlobalDeviceObject; @@ -20,7 +20,7 @@ VOID NTAPI NduUnload(PDRIVER_OBJECT DriverObject) { - DPRINT1("NDISUIO: Unloaded\n"); + DPRINT("NDISUIO: Unloaded\n"); } NTSTATUS @@ -98,7 +98,7 @@ return Status; } - DPRINT1("NDISUIO: Loaded\n"); + DPRINT("NDISUIO: Loaded\n"); return STATUS_SUCCESS; } Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Sat Jan 7 05:54:14 2012 @@ -8,10 +8,8 @@ #include "ndisuio.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> - -PNDIS_MEDIUM SupportedMedia = {NdisMedium802_3}; VOID NTAPI @@ -118,9 +116,7 @@ PNDIS_PACKET Packet; NDIS_STATUS Status; UINT BytesTransferred; - - DPRINT("Received a %d byte packet on %wZ\n", PacketSize + HeaderBufferSize, &AdapterContext->DeviceName); - + /* Discard if nobody is waiting for it */ if (AdapterContext->OpenCount == 0) return NDIS_STATUS_NOT_ACCEPTED; @@ -171,8 +167,8 @@ but not the pool because we still need it */ CleanupAndFreePacket(Packet, FALSE); - /* Allocate a packet entry from paged pool */ - PacketEntry = ExAllocatePool(PagedPool, sizeof(NDISUIO_PACKET_ENTRY) + BytesTransferred + HeaderBufferSize - 1); + /* Allocate a packet entry from pool */ + PacketEntry = ExAllocatePool(NonPagedPool, sizeof(NDISUIO_PACKET_ENTRY) + BytesTransferred + HeaderBufferSize - 1); if (!PacketEntry) { ExFreePool(PacketBuffer); @@ -183,7 +179,7 @@ PacketEntry->PacketLength = BytesTransferred + HeaderBufferSize; RtlCopyMemory(&PacketEntry->PacketData[0], PacketBuffer, PacketEntry->PacketLength); - /* Free the old non-paged buffer */ + /* Free the old buffer */ ExFreePool(PacketBuffer); /* Insert the packet on the adapter's packet list */ @@ -313,11 +309,10 @@ { NDIS_STATUS OpenErrorStatus; PNDISUIO_ADAPTER_CONTEXT AdapterContext; + NDIS_MEDIUM SupportedMedia[1] = {NdisMedium802_3}; UINT SelectedMedium; NDIS_STATUS Status; - - DPRINT("Binding adapter %wZ\n", &AdapterContext->DeviceName); - + /* Allocate the adapter context */ AdapterContext = ExAllocatePool(NonPagedPool, sizeof(*AdapterContext)); if (!AdapterContext) @@ -345,6 +340,8 @@ /* Copy the device name into the adapter context */ RtlCopyMemory(AdapterContext->DeviceName.Buffer, DeviceName->Buffer, DeviceName->Length); + + DPRINT("Binding adapter %wZ\n", &AdapterContext->DeviceName); /* Create the buffer pool */ NdisAllocateBufferPool(&Status, @@ -377,7 +374,7 @@ &OpenErrorStatus, &AdapterContext->BindingHandle, &SelectedMedium, - &SupportedMedia[0], + SupportedMedia, 1, GlobalProtocolHandle, AdapterContext,

1 0

[janderwald] 54856: [KBDHID] - Implement KbdHid_ReadCompletion routine - Start implementing KbdHid_InsertScanCodes routine
by janderwald＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: janderwald Date: Fri Jan 6 20:37:13 2012 New Revision: 54856 URL: http://svn.reactos.org/svn/reactos?rev=54856&view=rev Log: [KBDHID] - Implement KbdHid_ReadCompletion routine - Start implementing KbdHid_InsertScanCodes routine Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Jan 6 20:37:13 2012 @@ -13,8 +13,7 @@ VOID KbdHid_DispatchInputData( IN PKBDHID_DEVICE_EXTENSION DeviceExtension, - IN PKEYBOARD_INPUT_DATA InputData, - IN ULONG InputDataLength) + IN PKEYBOARD_INPUT_DATA InputData) { KIRQL OldIrql; ULONG InputDataConsumed; @@ -30,11 +29,37 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* dispatch input data */ - (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassService)(DeviceExtension->ClassDeviceObject, InputData, InputData + InputDataLength + 1, &InputDataConsumed); + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassService)(DeviceExtension->ClassDeviceObject, InputData, InputData + 1, &InputDataConsumed); /* lower irql to previous level */ KeLowerIrql(OldIrql); } + +BOOLEAN +NTAPI +KbdHid_InsertScanCodes( + IN PVOID Context, + IN PCHAR NewScanCodes, + IN ULONG Length) +{ + KEYBOARD_INPUT_DATA InputData; + ULONG Index; + + for(Index = 0; Index < Length; Index++) + { + DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); + // + // TODO: set up input data + // + //KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); + } + + // + // done + // + return TRUE; +} + NTSTATUS NTAPI @@ -44,6 +69,8 @@ IN PVOID Context) { PKBDHID_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + ULONG ButtonLength; /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; @@ -67,11 +94,27 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - UNIMPLEMENTED - ASSERT(FALSE); - - /* dispatch mouse action */ - //KbdHid_DispatchInputData(DeviceExtension, &InputData); + /* get current usages */ + ButtonLength = DeviceExtension->UsageListLength; + Status = HidP_GetUsagesEx(HidP_Input, HIDP_LINK_COLLECTION_UNSPECIFIED, DeviceExtension->CurrentUsageList, &ButtonLength, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* FIXME check if needs mapping */ + + /* get usage difference */ + Status = HidP_UsageAndPageListDifference(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, DeviceExtension->BreakUsageList, DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength); + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* replace previous usage list with current list */ + RtlMoveMemory(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, sizeof(USAGE_AND_PAGE) * DeviceExtension->UsageListLength); + + /* translate break usage list */ + HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->BreakUsageList, DeviceExtension->UsageListLength, HidP_Keyboard_Break, &DeviceExtension->ModifierState, KbdHid_InsertScanCodes, DeviceExtension); + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* translate new usage list */ + HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength, HidP_Keyboard_Make, &DeviceExtension->ModifierState, KbdHid_InsertScanCodes, DeviceExtension); + ASSERT(Status == HIDP_STATUS_SUCCESS); /* re-init read */ KbdHid_InitiateRead(DeviceExtension); Modified: branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/kbdhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Fri Jan 6 20:37:13 2012 @@ -67,7 +67,7 @@ // // preparsed data // - PVOID PreparsedData; + PHIDP_PREPARSED_DATA PreparsedData; // // mdl for reading input report @@ -77,7 +77,7 @@ // // input report buffer // - PUCHAR Report; + PCHAR Report; // // input report length @@ -104,6 +104,11 @@ // KEYBOARD_ATTRIBUTES Attributes; + // + // keyboard modifier state + // + HIDP_KEYBOARD_MODIFIER_STATE ModifierState; + }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; /* defaults from kbfiltr.h */

1 0

[cgutman] 54855: [NDISUIO] - Bug fixes - Make the packet and buffer pools per adapter - Crashes during bind for some reason
by cgutman＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: cgutman Date: Fri Jan 6 19:43:15 2012 New Revision: 54855 URL: http://svn.reactos.org/svn/reactos?rev=54855&view=rev Log: [NDISUIO] - Bug fixes - Make the packet and buffer pools per adapter - Crashes during bind for some reason Modified: branches/wlan-bringup/boot/bootdata/packages/reactos.dff branches/wlan-bringup/drivers/network/ndisuio/main.c branches/wlan-bringup/drivers/network/ndisuio/misc.c branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h branches/wlan-bringup/drivers/network/ndisuio/protocol.c branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/boot/bootdata/pack… ============================================================================== --- branches/wlan-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/wlan-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -532,6 +532,7 @@ drivers\network\tdi\tdi.sys 2 drivers\network\dd\ne2000\ne2000.sys 2 drivers\network\dd\pcnet\pcnet.sys 2 +drivers\network\ndisuio\ndisuio.sys 2 drivers\serial\serenum\serenum.sys 2 drivers\serial\serial\serial.sys 2 Modified: branches/wlan-bringup/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -15,8 +15,6 @@ NDIS_HANDLE GlobalProtocolHandle; KSPIN_LOCK GlobalAdapterListLock; LIST_ENTRY GlobalAdapterList; -NDIS_HANDLE GlobalPacketPoolHandle; -NDIS_HANDLE GlobalBufferPoolHandle; NDIS_STRING ProtocolName = RTL_CONSTANT_STRING(L"NDISUIO"); @@ -70,32 +68,6 @@ return Status; } - /* Create the buffer pool */ - NdisAllocateBufferPool(&Status, - &GlobalBufferPoolHandle, - 100); - if (Status != NDIS_STATUS_SUCCESS) - { - DPRINT1("Failed to allocate buffer pool with status 0x%x\n", Status); - IoDeleteSymbolicLink(&DosDeviceName); - IoDeleteDevice(GlobalDeviceObject); - return Status; - } - - /* Create the packet pool */ - NdisAllocatePacketPool(&Status, - &GlobalPacketPoolHandle, - 50, - 0); - if (Status != NDIS_STATUS_SUCCESS) - { - DPRINT1("Failed to allocate packet pool with status 0x%x\n", Status); - NdisFreeBufferPool(GlobalBufferPoolHandle); - IoDeleteSymbolicLink(&DosDeviceName); - IoDeleteDevice(GlobalDeviceObject); - return Status; - } - /* Register the protocol with NDIS */ RtlZeroMemory(&Chars, sizeof(Chars)); Chars.MajorNdisVersion = NDIS_MAJOR_VERSION; @@ -121,8 +93,6 @@ if (Status != NDIS_STATUS_SUCCESS) { DPRINT1("Failed to register protocol with status 0x%x\n", Status); - NdisFreePacketPool(GlobalPacketPoolHandle); - NdisFreeBufferPool(GlobalBufferPoolHandle); IoDeleteSymbolicLink(&DosDeviceName); IoDeleteDevice(GlobalDeviceObject); return Status; Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -12,7 +12,11 @@ #include <debug.h> NDIS_STATUS -AllocateAndChainBuffer(PNDIS_PACKET Packet, PVOID Buffer, ULONG BufferSize, BOOLEAN Front) +AllocateAndChainBuffer(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PNDIS_PACKET Packet, + PVOID Buffer, + ULONG BufferSize, + BOOLEAN Front) { NDIS_STATUS Status; PNDIS_BUFFER NdisBuffer; @@ -20,7 +24,7 @@ /* Allocate the NDIS buffer mapping the pool */ NdisAllocateBuffer(&Status, &NdisBuffer, - GlobalBufferPoolHandle, + AdapterContext->BufferPoolHandle, Buffer, BufferSize); if (Status != NDIS_STATUS_SUCCESS) @@ -45,7 +49,9 @@ } PNDIS_PACKET -CreatePacketFromPoolBuffer(PVOID Buffer, ULONG BufferSize) +CreatePacketFromPoolBuffer(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PVOID Buffer, + ULONG BufferSize) { PNDIS_PACKET Packet; NDIS_STATUS Status; @@ -53,7 +59,7 @@ /* Allocate a packet descriptor */ NdisAllocatePacket(&Status, &Packet, - GlobalPacketPoolHandle); + AdapterContext->PacketPoolHandle); if (Status != NDIS_STATUS_SUCCESS) { DPRINT1("No free packet descriptors\n"); @@ -61,7 +67,8 @@ } /* Use the helper to chain the buffer */ - Status = AllocateAndChainBuffer(Packet, Buffer, BufferSize, TRUE); + Status = AllocateAndChainBuffer(AdapterContext, Packet, + Buffer, BufferSize, TRUE); if (Status != NDIS_STATUS_SUCCESS) { NdisFreePacket(Packet); Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -15,8 +15,6 @@ extern NDIS_HANDLE GlobalProtocolHandle; extern LIST_ENTRY GlobalAdapterList; extern KSPIN_LOCK GlobalAdapterListLock; -extern NDIS_HANDLE GlobalPacketPoolHandle; -extern NDIS_HANDLE GlobalBufferPoolHandle; typedef struct _NDISUIO_ADAPTER_CONTEXT { @@ -30,6 +28,10 @@ /* Reference count information */ ULONG OpenCount; LIST_ENTRY OpenEntryList; + + /* NDIS pools */ + NDIS_HANDLE PacketPoolHandle; + NDIS_HANDLE BufferPoolHandle; /* Receive packet list */ LIST_ENTRY PacketList; @@ -92,13 +94,15 @@ /* misc.c */ NDIS_STATUS -AllocateAndChainBuffer(PNDIS_PACKET Packet, +AllocateAndChainBuffer(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PNDIS_PACKET Packet, PVOID Buffer, ULONG BufferSize, BOOLEAN Front); PNDIS_PACKET -CreatePacketFromPoolBuffer(PVOID Buffer, +CreatePacketFromPoolBuffer(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PVOID Buffer, ULONG BufferSize); VOID Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -8,7 +8,7 @@ #include "ndisuio.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> PNDIS_MEDIUM SupportedMedia = {NdisMedium802_3}; @@ -119,13 +119,20 @@ NDIS_STATUS Status; UINT BytesTransferred; + DPRINT("Received a %d byte packet on %wZ\n", PacketSize + HeaderBufferSize, &AdapterContext->DeviceName); + + /* Discard if nobody is waiting for it */ + if (AdapterContext->OpenCount == 0) + return NDIS_STATUS_NOT_ACCEPTED; + /* Allocate a buffer to hold the packet data and header */ PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize); if (!PacketBuffer) return NDIS_STATUS_NOT_ACCEPTED; /* Allocate the packet descriptor and buffer */ - Packet = CreatePacketFromPoolBuffer((PUCHAR)PacketBuffer + HeaderBufferSize, + Packet = CreatePacketFromPoolBuffer(AdapterContext, + (PUCHAR)PacketBuffer + HeaderBufferSize, PacketSize); if (!Packet) { @@ -221,20 +228,28 @@ UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) { KIRQL OldIrql; - PLIST_ENTRY CurrentOpenEntry; + PLIST_ENTRY CurrentEntry; PNDISUIO_OPEN_ENTRY OpenEntry; + PNDISUIO_PACKET_ENTRY PacketEntry; NDIS_STATUS Status; + DPRINT("Unbinding adapter %wZ\n", &AdapterContext->DeviceName); + + /* FIXME: We don't do anything with outstanding reads */ + /* Remove the adapter context from the global list */ KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); RemoveEntryList(&AdapterContext->ListEntry); KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + /* Free the device name string */ + RtlFreeUnicodeString(&AdapterContext->DeviceName); /* Invalidate all handles to this adapter */ - CurrentOpenEntry = AdapterContext->OpenEntryList.Flink; - while (CurrentOpenEntry != &AdapterContext->OpenEntryList) - { - OpenEntry = CONTAINING_RECORD(CurrentOpenEntry, NDISUIO_OPEN_ENTRY, ListEntry); + CurrentEntry = AdapterContext->OpenEntryList.Flink; + while (CurrentEntry != &AdapterContext->OpenEntryList) + { + OpenEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_OPEN_ENTRY, ListEntry); /* Make sure the entry is sane */ ASSERT(OpenEntry->FileObject); @@ -249,7 +264,7 @@ OpenEntry->FileObject->FsContext2 = NULL; /* Move to the next entry */ - CurrentOpenEntry = CurrentOpenEntry->Flink; + CurrentEntry = CurrentEntry->Flink; /* Free the open entry */ ExFreePool(OpenEntry); @@ -257,6 +272,19 @@ /* If this fails, we have a refcount mismatch somewhere */ ASSERT(AdapterContext->OpenCount == 0); + + /* Free all pending packet entries */ + CurrentEntry = AdapterContext->PacketList.Flink; + while (CurrentEntry != &AdapterContext->PacketList) + { + PacketEntry = CONTAINING_RECORD(CurrentEntry, NDISUIO_PACKET_ENTRY, ListEntry); + + /* Move to the next entry */ + CurrentEntry = CurrentEntry->Flink; + + /* Free the packet entry */ + ExFreePool(PacketEntry); + } /* Send the close request */ NdisCloseAdapter(&Status, @@ -287,6 +315,8 @@ PNDISUIO_ADAPTER_CONTEXT AdapterContext; UINT SelectedMedium; NDIS_STATUS Status; + + DPRINT("Binding adapter %wZ\n", &AdapterContext->DeviceName); /* Allocate the adapter context */ AdapterContext = ExAllocatePool(NonPagedPool, sizeof(*AdapterContext)); @@ -313,15 +343,42 @@ return NDIS_STATUS_RESOURCES; } + /* Copy the device name into the adapter context */ RtlCopyMemory(AdapterContext->DeviceName.Buffer, DeviceName->Buffer, DeviceName->Length); - + + /* Create the buffer pool */ + NdisAllocateBufferPool(&Status, + &AdapterContext->BufferPoolHandle, + 50); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to allocate buffer pool with status 0x%x\n", Status); + RtlFreeUnicodeString(&AdapterContext->DeviceName); + ExFreePool(AdapterContext); + return Status; + } + + /* Create the packet pool */ + NdisAllocatePacketPool(&Status, + &AdapterContext->PacketPoolHandle, + 25, + PROTOCOL_RESERVED_SIZE_IN_PACKET); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to allocate packet pool with status 0x%x\n", Status); + NdisFreeBufferPool(AdapterContext->BufferPoolHandle); + RtlFreeUnicodeString(&AdapterContext->DeviceName); + ExFreePool(AdapterContext); + return Status; + } + /* Send the open request */ NdisOpenAdapter(&Status, &OpenErrorStatus, &AdapterContext->BindingHandle, &SelectedMedium, - SupportedMedia, - sizeof(SupportedMedia), + &SupportedMedia[0], + 1, GlobalProtocolHandle, AdapterContext, DeviceName, @@ -343,6 +400,9 @@ if (Status != NDIS_STATUS_SUCCESS) { DPRINT1("Failed to open adapter for bind with status 0x%x\n", Status); + NdisFreePacketPool(AdapterContext->PacketPoolHandle); + NdisFreeBufferPool(AdapterContext->BufferPoolHandle); + RtlFreeUnicodeString(&AdapterContext->DeviceName); ExFreePool(AdapterContext); return Status; } Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Fri Jan 6 19:43:15 2012 @@ -167,7 +167,8 @@ ASSERT(DeviceObject == GlobalDeviceObject); /* Create a packet and buffer descriptor for this user buffer */ - Packet = CreatePacketFromPoolBuffer(Irp->AssociatedIrp.SystemBuffer, + Packet = CreatePacketFromPoolBuffer(AdapterContext, + Irp->AssociatedIrp.SystemBuffer, IrpSp->Parameters.Write.Length); if (Packet) { @@ -191,7 +192,7 @@ if (Status == NDIS_STATUS_SUCCESS) BytesCopied = IrpSp->Parameters.Write.Length; - CleanupAndFreePacket(Packet, TRUE); + CleanupAndFreePacket(Packet, FALSE); } else {

1 0

[janderwald] 54854: [USB-BRINGUP] - Partial trunk sync
by janderwald＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: janderwald Date: Fri Jan 6 19:40:46 2012 New Revision: 54854 URL: http://svn.reactos.org/svn/reactos?rev=54854&view=rev Log: [USB-BRINGUP] - Partial trunk sync Added: branches/usb-bringup/configure.sh (props changed) - copied unchanged from r54852, trunk/reactos/configure.sh branches/usb-bringup/toolchain-gcc.cmake (props changed) - copied unchanged from r54852, trunk/reactos/toolchain-gcc.cmake Modified: branches/usb-bringup/CMakeLists.txt (props changed) branches/usb-bringup/CMakeMacros.cmake (props changed) branches/usb-bringup/COPYING (props changed) branches/usb-bringup/COPYING.ARM (props changed) branches/usb-bringup/COPYING.LIB (props changed) branches/usb-bringup/COPYING3 (props changed) branches/usb-bringup/COPYING3.LIB (props changed) branches/usb-bringup/CREDITS (contents, props changed) branches/usb-bringup/Doxyfile (props changed) branches/usb-bringup/INSTALL (props changed) branches/usb-bringup/PreLoad.cmake (props changed) branches/usb-bringup/README (props changed) branches/usb-bringup/apistatus.lst (props changed) branches/usb-bringup/baseaddress.cmake (props changed) branches/usb-bringup/cmake/ (props changed) branches/usb-bringup/cmake/Platform/ (props changed) branches/usb-bringup/cmake/Platform/Windows-cl.cmake (props changed) branches/usb-bringup/cmake/Platform/Windows.cmake (props changed) branches/usb-bringup/cmake/idl-support.cmake (props changed) branches/usb-bringup/config-amd64.cmake (props changed) branches/usb-bringup/config-arm.cmake (props changed) branches/usb-bringup/config.cmake (props changed) branches/usb-bringup/configure.cmd (props changed) branches/usb-bringup/depmap.xsl (props changed) branches/usb-bringup/gcc.cmake (props changed) branches/usb-bringup/global.lds (props changed) branches/usb-bringup/msc.cmake (props changed) branches/usb-bringup/ros_cd.cmake (props changed) branches/usb-bringup/rosbuild.bat (props changed) branches/usb-bringup/toolchain-mingw32.cmake (props changed) branches/usb-bringup/toolchain-msvc.cmake (props changed) branches/usb-bringup/vreport.xsl (props changed) Propchange: branches/usb-bringup/CMakeLists.txt ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/CMakeMacros.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/COPYING ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/COPYING.ARM ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/COPYING.LIB ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/COPYING3 ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/COPYING3.LIB ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/usb-bringup/CREDITS URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/CREDITS?rev=54854&r… ============================================================================== --- branches/usb-bringup/CREDITS [iso-8859-1] (original) +++ branches/usb-bringup/CREDITS [iso-8859-1] Fri Jan 6 19:40:46 2012 @@ -58,6 +58,7 @@ Peter Ward <dralnix(a)gmail.com> Pierre Schweitzer <pschweitzer(a)reactos.org> Phillip Susi <phreak(a)iag.net> +Rafal Harabien <rafalh(a)reactos.org> Rex Jolliff <rex(a)lvcablemodem.com> Richard Campbell <betam4x(a)gmail.com> Robert Bergkvist <fragdance(a)hotmail.com> Propchange: branches/usb-bringup/CREDITS ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/Doxyfile ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/INSTALL ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/PreLoad.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/README ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/apistatus.lst ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: branches/usb-bringup/apistatus.lst ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/baseaddress.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/cmake/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/cmake/Platform/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/cmake/Platform/Windows-cl.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/cmake/Platform/Windows.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/cmake/idl-support.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/config-amd64.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/config-arm.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/config.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/configure.cmd ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/configure.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/usb-bringup/configure.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: branches/usb-bringup/configure.sh ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/depmap.xsl ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/gcc.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/global.lds ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/msc.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/ros_cd.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/rosbuild.bat ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/toolchain-gcc.cmake ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/usb-bringup/toolchain-gcc.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/toolchain-mingw32.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/toolchain-msvc.cmake ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/usb-bringup/vreport.xsl ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[spetreolle] 54853: [NDISUIO] Add missing include path.
by spetreolle＠svn.reactos.org 06 Jan '12

06 Jan '12

Author: spetreolle Date: Fri Jan 6 19:32:05 2012 New Revision: 54853 URL: http://svn.reactos.org/svn/reactos?rev=54853&view=rev Log: [NDISUIO] Add missing include path. Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] Fri Jan 6 19:32:05 2012 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ndisuio" type="kernelmodedriver" installbase="system32/drivers" installname="ndisuio.sys"> <include base="ndisuio">.</include> + <include base="ReactOS">include/reactos/drivers/ndisuio</include> <define name="NDIS50" /> <define name="_NTDRIVER_" /> <library>ndis</library>

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