Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 55796: revert r55794, the problem is elsewhere
by jgardou＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: jgardou Date: Tue Feb 21 21:58:42 2012 New Revision: 55796 URL: http://svn.reactos.org/svn/reactos?rev=55796&view=rev Log: revert r55794, the problem is elsewhere Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Feb 21 21:58:42 2012 @@ -963,10 +963,10 @@ fclose(&_iob[2]); for(i=0; i<sizeof(__pioinfo)/sizeof(__pioinfo[0]); i++) - if(__pioinfo[i]) free(__pioinfo[i]); + free(__pioinfo[i]); for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) - if(fstream[i]) free(fstream[i]); + free(fstream[i]); file_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&file_cs);

1 0

[ion] 55795: [KERNEL32]: Lock/UnlockFile APIs should not allow console handles. Also remove superflous parameter check. [KERNEL32]: Lock/UnlockFile APIs should handle STATUS_PENDING/ERROR_IO_PENDIN...
by ion＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: ion Date: Tue Feb 21 21:38:08 2012 New Revision: 55795 URL: http://svn.reactos.org/svn/reactos?rev=55795&view=rev Log: [KERNEL32]: Lock/UnlockFile APIs should not allow console handles. Also remove superflous parameter check. [KERNEL32]: Lock/UnlockFile APIs should handle STATUS_PENDING/ERROR_IO_PENDING situations instead of always assuming the Nt functions return synchronously. [KERNEL32]: Other stylying changes + commenting/annotations. Modified: trunk/reactos/dll/win32/kernel32/client/file/lock.c Modified: trunk/reactos/dll/win32/kernel32/client/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/lock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/lock.c [iso-8859-1] Tue Feb 21 21:38:08 2012 @@ -9,14 +9,12 @@ * Created 01/11/98 */ -/* FIXME: the large integer manipulations in this file dont handle overflow */ /* INCLUDES ****************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -25,165 +23,207 @@ */ BOOL WINAPI -LockFile(HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh) -{ - DWORD dwReserved; +LockFile(IN HANDLE hFile, + IN DWORD dwFileOffsetLow, + IN DWORD dwFileOffsetHigh, + IN DWORD nNumberOfBytesToLockLow, + IN DWORD nNumberOfBytesToLockHigh) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + LARGE_INTEGER BytesToLock, Offset; + + /* Is this a console handle? */ + if (IsConsoleHandle(hFile)) + { + /* Can't "lock" a console! */ + BaseSetLastNTError(STATUS_INVALID_HANDLE); + return FALSE; + } + + /* Setup the parameters in NT style and call the native API */ + BytesToLock.u.LowPart = nNumberOfBytesToLockLow; + BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; + Offset.u.LowPart = dwFileOffsetLow; + Offset.u.HighPart = dwFileOffsetHigh; + Status = NtLockFile(hFile, + NULL, + NULL, + NULL, + &IoStatusBlock, + &Offset, + &BytesToLock, + 0, + TRUE, + TRUE); + if (Status == STATUS_PENDING) + { + /* Wait for completion if needed */ + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = IoStatusBlock.Status; + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Convert the error code and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Success! */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +LockFileEx(IN HANDLE hFile, + IN DWORD dwFlags, + IN DWORD dwReserved, + IN DWORD nNumberOfBytesToLockLow, + IN DWORD nNumberOfBytesToLockHigh, + IN LPOVERLAPPED lpOverlapped) +{ + LARGE_INTEGER BytesToLock, Offset; + NTSTATUS Status; + + /* Is this a console handle? */ + if (IsConsoleHandle(hFile)) + { + /* Can't "lock" a console! */ + BaseSetLastNTError(STATUS_INVALID_HANDLE); + return FALSE; + } + + /* This parameter should be zero */ + if (dwReserved) + { + /* Fail since it isn't */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Set the initial status in the IO_STATUS_BLOCK to pending... */ + lpOverlapped->Internal = STATUS_PENDING; + + /* Convert the parameters to NT format and call the native API */ + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + BytesToLock.u.LowPart = nNumberOfBytesToLockLow; + BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; + Status = NtLockFile(hFile, + lpOverlapped->hEvent, + NULL, + NULL, + (PIO_STATUS_BLOCK)lpOverlapped, + &Offset, + &BytesToLock, + 0, + dwFlags & LOCKFILE_FAIL_IMMEDIATELY ? TRUE : FALSE, + dwFlags & LOCKFILE_EXCLUSIVE_LOCK ? TRUE: FALSE); + if ((NT_SUCCESS(Status)) && (Status != STATUS_PENDING)) + { + /* Pending status is *not* allowed in the Ex API */ + return TRUE; + } + + /* Convert the error code and fail */ + BaseSetLastNTError(Status); + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +UnlockFile(IN HANDLE hFile, + IN DWORD dwFileOffsetLow, + IN DWORD dwFileOffsetHigh, + IN DWORD nNumberOfBytesToUnlockLow, + IN DWORD nNumberOfBytesToUnlockHigh) +{ OVERLAPPED Overlapped; - + NTSTATUS Status; + BOOLEAN Result; + + /* Convert parameters to Ex format and call the new API */ Overlapped.Offset = dwFileOffsetLow; Overlapped.OffsetHigh = dwFileOffsetHigh; - Overlapped.hEvent = NULL; - dwReserved = 0; - - return LockFileEx(hFile, - LOCKFILE_FAIL_IMMEDIATELY | - LOCKFILE_EXCLUSIVE_LOCK, - dwReserved, - nNumberOfBytesToLockLow, - nNumberOfBytesToLockHigh, - &Overlapped ) ; -} - - -/* - * @implemented - */ -BOOL -WINAPI -LockFileEx(HANDLE hFile, - DWORD dwFlags, - DWORD dwReserved, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh, - LPOVERLAPPED lpOverlapped /* required! */) -{ - LARGE_INTEGER BytesToLock; - BOOL LockImmediate; - BOOL LockExclusive; - NTSTATUS errCode; - LARGE_INTEGER Offset; - - if(dwReserved != 0 || lpOverlapped==NULL) - { + Result = UnlockFileEx(hFile, + 0, + nNumberOfBytesToUnlockLow, + nNumberOfBytesToUnlockHigh, + &Overlapped); + if (!(Result) && (GetLastError() == ERROR_IO_PENDING)) + { + /* Ex fails during STATUS_PENDING, handle that here by waiting */ + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Overlapped.Internal; + + /* Now if the status is successful, return */ + if (!NT_SUCCESS(Status)) return TRUE; + + /* Otherwise the asynchronous operation had a failure, so fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Success or error case -- Ex took care of the rest, just return */ + return Result; +} + +/* + * @implemented + */ +BOOL +WINAPI +UnlockFileEx(IN HANDLE hFile, + IN DWORD dwReserved, + IN DWORD nNumberOfBytesToUnLockLow, + IN DWORD nNumberOfBytesToUnLockHigh, + IN LPOVERLAPPED lpOverlapped) +{ + LARGE_INTEGER BytesToUnLock, StartAddress; + NTSTATUS Status; + + /* Is this a console handle? */ + if (IsConsoleHandle(hFile)) + { + /* Can't "unlock" a console! */ + BaseSetLastNTError(STATUS_INVALID_HANDLE); + return FALSE; + } + + /* This parameter should be zero */ + if (dwReserved) + { + /* Fail since it isn't */ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - TRACE( "%p %x%08x %x%08x flags %x\n", - hFile, lpOverlapped->OffsetHigh, lpOverlapped->Offset, - nNumberOfBytesToLockHigh, nNumberOfBytesToLockLow, dwFlags ); - - lpOverlapped->Internal = STATUS_PENDING; - - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; - - if ( (dwFlags & LOCKFILE_FAIL_IMMEDIATELY) == LOCKFILE_FAIL_IMMEDIATELY ) - LockImmediate = TRUE; - else - LockImmediate = FALSE; - - if ( (dwFlags & LOCKFILE_EXCLUSIVE_LOCK) == LOCKFILE_EXCLUSIVE_LOCK ) - LockExclusive = TRUE; - else - LockExclusive = FALSE; - - BytesToLock.u.LowPart = nNumberOfBytesToLockLow; - BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; - - errCode = NtLockFile(hFile, - lpOverlapped->hEvent, - NULL, - NULL, - (PIO_STATUS_BLOCK)lpOverlapped, - &Offset, - &BytesToLock, - 0, - (BOOLEAN)LockImmediate, - (BOOLEAN)LockExclusive); - - if ( !NT_SUCCESS(errCode) ) - { - BaseSetLastNTError(errCode); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -UnlockFile(HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToUnlockLow, - DWORD nNumberOfBytesToUnlockHigh) -{ - OVERLAPPED Overlapped; - DWORD dwReserved; - Overlapped.Offset = dwFileOffsetLow; - Overlapped.OffsetHigh = dwFileOffsetHigh; - dwReserved = 0; - - return UnlockFileEx(hFile, - dwReserved, - nNumberOfBytesToUnlockLow, - nNumberOfBytesToUnlockHigh, - &Overlapped); -} - - -/* - * @implemented - */ -BOOL -WINAPI -UnlockFileEx(HANDLE hFile, - DWORD dwReserved, - DWORD nNumberOfBytesToUnLockLow, - DWORD nNumberOfBytesToUnLockHigh, - LPOVERLAPPED lpOverlapped /* required! */) -{ - LARGE_INTEGER BytesToUnLock; - LARGE_INTEGER StartAddress; - NTSTATUS errCode; - - if(dwReserved != 0 || lpOverlapped == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - TRACE( "%p %x%08x %x%08x\n", - hFile, lpOverlapped->OffsetHigh, lpOverlapped->Offset, - nNumberOfBytesToUnLockHigh, nNumberOfBytesToUnLockLow); - + /* Convert to NT format and call the native function */ BytesToUnLock.u.LowPart = nNumberOfBytesToUnLockLow; BytesToUnLock.u.HighPart = nNumberOfBytesToUnLockHigh; - StartAddress.u.LowPart = lpOverlapped->Offset; StartAddress.u.HighPart = lpOverlapped->OffsetHigh; - - errCode = NtUnlockFile(hFile, - (PIO_STATUS_BLOCK)lpOverlapped, - &StartAddress, - &BytesToUnLock, - 0); - - if ( !NT_SUCCESS(errCode) ) - { - BaseSetLastNTError(errCode); - return FALSE; - } - + Status = NtUnlockFile(hFile, + (PIO_STATUS_BLOCK)lpOverlapped, + &StartAddress, + &BytesToUnLock, + 0); + if (!NT_SUCCESS(Status)) + { + /* Convert the error and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* All good */ return TRUE; }

1 0

[jgardou] 55794: [CRT] - Check for NULL before freeing
by jgardou＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: jgardou Date: Tue Feb 21 21:36:01 2012 New Revision: 55794 URL: http://svn.reactos.org/svn/reactos?rev=55794&view=rev Log: [CRT] - Check for NULL before freeing Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Feb 21 21:36:01 2012 @@ -963,10 +963,10 @@ fclose(&_iob[2]); for(i=0; i<sizeof(__pioinfo)/sizeof(__pioinfo[0]); i++) - free(__pioinfo[i]); + if(__pioinfo[i]) free(__pioinfo[i]); for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) - free(fstream[i]); + if(fstream[i]) free(fstream[i]); file_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&file_cs);

1 0

[ion] 55793: [KERNEL32]: Format, comment, annotate, cleanup the I/O completion APIs.
by ion＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: ion Date: Tue Feb 21 21:31:01 2012 New Revision: 55793 URL: http://svn.reactos.org/svn/reactos?rev=55793&view=rev Log: [KERNEL32]: Format, comment, annotate, cleanup the I/O completion APIs. Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Tue Feb 21 21:31:01 2012 @@ -13,164 +13,160 @@ #define NDEBUG #include <debug.h> -#define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100) -#define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000)) -#define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000)) - /* * @implemented */ HANDLE WINAPI -CreateIoCompletionPort( - HANDLE FileHandle, - HANDLE ExistingCompletionPort, - ULONG_PTR CompletionKey, - DWORD NumberOfConcurrentThreads - ) -{ - HANDLE CompletionPort = NULL; - NTSTATUS errCode; - FILE_COMPLETION_INFORMATION CompletionInformation; - IO_STATUS_BLOCK IoStatusBlock; - - if ( FileHandle == INVALID_HANDLE_VALUE && ExistingCompletionPort != NULL ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ( ExistingCompletionPort != NULL ) - { - CompletionPort = ExistingCompletionPort; - } - else - { - - errCode = NtCreateIoCompletion(&CompletionPort, - IO_COMPLETION_ALL_ACCESS, - NULL,//ObjectAttributes - NumberOfConcurrentThreads); - - if (!NT_SUCCESS(errCode) ) - { - BaseSetLastNTError (errCode); - return FALSE; - } - - } - - if ( FileHandle != INVALID_HANDLE_VALUE ) - { - CompletionInformation.Port = CompletionPort; - CompletionInformation.Key = (PVOID)CompletionKey; - - errCode = NtSetInformationFile(FileHandle, - &IoStatusBlock, - &CompletionInformation, - sizeof(FILE_COMPLETION_INFORMATION), - FileCompletionInformation); - - if ( !NT_SUCCESS(errCode) ) - { - if ( ExistingCompletionPort == NULL ) - { - NtClose(CompletionPort); - } - - BaseSetLastNTError (errCode); - return FALSE; - } - } - - return CompletionPort; -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetQueuedCompletionStatus( - HANDLE CompletionHandle, - LPDWORD lpNumberOfBytesTransferred, - PULONG_PTR lpCompletionKey, - LPOVERLAPPED *lpOverlapped, - DWORD dwMilliseconds - ) -{ - NTSTATUS errCode; - IO_STATUS_BLOCK IoStatus; - ULONG_PTR CompletionKey; - LARGE_INTEGER Time; - PLARGE_INTEGER TimePtr; - - if (!lpNumberOfBytesTransferred || !lpCompletionKey || !lpOverlapped) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Convert the timeout */ - TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); - - errCode = NtRemoveIoCompletion(CompletionHandle, +CreateIoCompletionPort(IN HANDLE FileHandle, + IN HANDLE ExistingCompletionPort, + IN ULONG_PTR CompletionKey, + IN DWORD NumberOfConcurrentThreads) +{ + NTSTATUS Status; + HANDLE NewPort; + FILE_COMPLETION_INFORMATION CompletionInformation; + IO_STATUS_BLOCK IoStatusBlock; + + /* Check if this is a new port */ + NewPort = ExistingCompletionPort; + if (!ExistingCompletionPort) + { + /* Create it */ + Status = NtCreateIoCompletion(&NewPort, + IO_COMPLETION_ALL_ACCESS, + NULL, + NumberOfConcurrentThreads); + if (!NT_SUCCESS(Status)) + { + /* Convert error and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + } + + /* Check if no actual file is being associated with the completion port */ + if (FileHandle == INVALID_HANDLE_VALUE) + { + /* Was there a port already associated? */ + if (ExistingCompletionPort) + { + /* You are not allowed using an old port and dropping the handle */ + NewPort = NULL; + BaseSetLastNTError(STATUS_INVALID_PARAMETER); + } + } + else + { + /* We have a file handle, so associated it with this completion port */ + CompletionInformation.Port = NewPort; + CompletionInformation.Key = (PVOID)CompletionKey; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &CompletionInformation, + sizeof(FILE_COMPLETION_INFORMATION), + FileCompletionInformation); + if (!NT_SUCCESS(Status)) + { + /* Convert the error code and close the newly created port, if any */ + BaseSetLastNTError(Status); + if (!ExistingCompletionPort) NtClose(NewPort); + return FALSE; + } + } + + /* Return the newly created port, if any */ + return NewPort; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetQueuedCompletionStatus(IN HANDLE CompletionHandle, + IN LPDWORD lpNumberOfBytesTransferred, + OUT PULONG_PTR lpCompletionKey, + OUT LPOVERLAPPED *lpOverlapped, + IN DWORD dwMilliseconds) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + ULONG_PTR CompletionKey; + LARGE_INTEGER Time; + PLARGE_INTEGER TimePtr; + + /* Convert the timeout and then call the native API */ + TimePtr = BaseFormatTimeOut(&Time, dwMilliseconds); + Status = NtRemoveIoCompletion(CompletionHandle, (PVOID*)&CompletionKey, (PVOID*)lpOverlapped, &IoStatus, TimePtr); - - if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { - *lpOverlapped = NULL; - - if(errCode == STATUS_TIMEOUT) - SetLastError(WAIT_TIMEOUT); - else - BaseSetLastNTError(errCode); - - return FALSE; - } - - *lpCompletionKey = CompletionKey; - *lpNumberOfBytesTransferred = IoStatus.Information; - - if (!NT_SUCCESS(IoStatus.Status)){ - //failed io operation - BaseSetLastNTError(IoStatus.Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -PostQueuedCompletionStatus( - HANDLE CompletionHandle, - DWORD dwNumberOfBytesTransferred, - ULONG_PTR dwCompletionKey, - LPOVERLAPPED lpOverlapped - ) -{ - NTSTATUS errCode; - - errCode = NtSetIoCompletion(CompletionHandle, - (PVOID)dwCompletionKey, // KeyContext - (PVOID)lpOverlapped, // ApcContext - STATUS_SUCCESS, // IoStatusBlock->Status - dwNumberOfBytesTransferred); // IoStatusBlock->Information - - if ( !NT_SUCCESS(errCode) ) - { - BaseSetLastNTError (errCode); - return FALSE; - } - return TRUE; + if (!(NT_SUCCESS(Status)) || (Status == STATUS_TIMEOUT)) + { + /* Clear out the overlapped output */ + *lpOverlapped = NULL; + + /* Check what kind of error we got */ + if (Status == STATUS_TIMEOUT) + { + /* Timeout error is set directly since there's no conversion */ + SetLastError(WAIT_TIMEOUT); + } + else + { + /* Any other error gets converted */ + BaseSetLastNTError(Status); + } + + /* This is a failure case */ + return FALSE; + } + + /* Write back the output parameters */ + *lpCompletionKey = CompletionKey; + *lpNumberOfBytesTransferred = IoStatus.Information; + + /* Check for error */ + if (!NT_SUCCESS(IoStatus.Status)) + { + /* Convert and fail */ + BaseSetLastNTError(IoStatus.Status); + return FALSE; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +PostQueuedCompletionStatus(IN HANDLE CompletionHandle, + IN DWORD dwNumberOfBytesTransferred, + IN ULONG_PTR dwCompletionKey, + IN LPOVERLAPPED lpOverlapped) +{ + NTSTATUS Status; + + /* Call the native API */ + Status = NtSetIoCompletion(CompletionHandle, + (PVOID)dwCompletionKey, + (PVOID)lpOverlapped, + STATUS_SUCCESS, + dwNumberOfBytesTransferred); + if (!NT_SUCCESS(Status)) + { + /* Convert the error and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Success path */ + return TRUE; } /* @@ -211,7 +207,7 @@ } /* Fail if we had an error -- the last error is already set */ - if (WaitStatus != 0) return FALSE; + if (WaitStatus) return FALSE; } /* Return bytes transferred */ @@ -234,24 +230,24 @@ */ BOOL WINAPI -BindIoCompletionCallback(HANDLE FileHandle, - LPOVERLAPPED_COMPLETION_ROUTINE Function, - ULONG Flags) -{ - NTSTATUS Status = 0; - - DPRINT("(%p, %p, %d)\n", FileHandle, Function, Flags); - +BindIoCompletionCallback(IN HANDLE FileHandle, + IN LPOVERLAPPED_COMPLETION_ROUTINE Function, + IN ULONG Flags) +{ + NTSTATUS Status; + + /* Call RTL */ Status = RtlSetIoCompletionCallback(FileHandle, (PIO_APC_ROUTINE)Function, Flags); - if (!NT_SUCCESS(Status)) { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - + /* Set error and fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Return success */ return TRUE; }

1 0

[cgutman] 55792: [USBOHCI] - Fix indication of USB_PORT_STATUS_RESET changes - Fixes premature completion of resets causing assertions to fail
by cgutman＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: cgutman Date: Tue Feb 21 20:32:48 2012 New Revision: 55792 URL: http://svn.reactos.org/svn/reactos?rev=55792&view=rev Log: [USBOHCI] - Fix indication of USB_PORT_STATUS_RESET changes - Fixes premature completion of resets causing assertions to fail Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Tue Feb 21 20:32:48 2012 @@ -1185,14 +1185,11 @@ if (Value & OHCI_RH_PORTSTATUS_PSSC) *PortChange |= USB_PORT_STATUS_ENABLE; - // port reset started (change bit only set at completion) + // port reset started if (Value & OHCI_RH_PORTSTATUS_PRS) - { *PortStatus |= USB_PORT_STATUS_RESET; - *PortChange |= USB_PORT_STATUS_RESET; - } - - // port reset ended (change bit only set at completion) + + // port reset ended if (Value & OHCI_RH_PORTSTATUS_PRSC) *PortChange |= USB_PORT_STATUS_RESET;

1 0

[ion] 55791: [KERNEL32]: Use macro for CreateMailSlotA->CreateMailSlotW.
by ion＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: ion Date: Tue Feb 21 19:19:44 2012 New Revision: 55791 URL: http://svn.reactos.org/svn/reactos?rev=55791&view=rev Log: [KERNEL32]: Use macro for CreateMailSlotA->CreateMailSlotW. Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c trunk/reactos/dll/win32/kernel32/include/base_x.h Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] Tue Feb 21 19:19:44 2012 @@ -26,32 +26,8 @@ IN DWORD lReadTimeout, IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PUNICODE_STRING NameU; - ANSI_STRING NameA; - NTSTATUS Status; - - NameU = &NtCurrentTeb()->StaticUnicodeString; - - RtlInitAnsiString(&NameA, (LPSTR)lpName); - Status = RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_BUFFER_OVERFLOW) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - } - else - { - BaseSetLastNTError(Status); - } - - return INVALID_HANDLE_VALUE; - } - - return CreateMailslotW(NameU->Buffer, - nMaxMessageSize, - lReadTimeout, - lpSecurityAttributes); + /* Call the W(ide) function */ + ConvertWin32AnsiObjectApiToUnicodeApi2(Mailslot, lpName, nMaxMessageSize, lReadTimeout, lpSecurityAttributes); } /* Modified: trunk/reactos/dll/win32/kernel32/include/base_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/base_x.h [iso-8859-1] Tue Feb 21 19:19:44 2012 @@ -56,6 +56,17 @@ if (!name) return Create##obj##W(__VA_ARGS__, NULL); \ ConvertAnsiToUnicodeBody(name) \ if (NT_SUCCESS(Status)) return Create##obj##W(__VA_ARGS__, UnicodeCache->Buffer); \ + ConvertAnsiToUnicodeEpilogue + +// +// This macro uses the ConvertAnsiToUnicode macros above to convert a CreateXxxA +// Win32 API into its equivalent CreateXxxW API. +// +#define ConvertWin32AnsiObjectApiToUnicodeApi2(obj, name, ...) \ + ConvertAnsiToUnicodePrologue \ + if (!name) return Create##obj##W(NULL, __VA_ARGS__); \ + ConvertAnsiToUnicodeBody(name) \ + if (NT_SUCCESS(Status)) return Create##obj##W(UnicodeCache->Buffer, __VA_ARGS__); \ ConvertAnsiToUnicodeEpilogue //

1 0

[ion] 55790: [KERNEL32]: CreateHardLinkW was not setting last error on failure. [KERNEL32]: Cleanup/format/comment/annotate CreateHardLink*.
by ion＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: ion Date: Tue Feb 21 19:18:57 2012 New Revision: 55790 URL: http://svn.reactos.org/svn/reactos?rev=55790&view=rev Log: [KERNEL32]: CreateHardLinkW was not setting last error on failure. [KERNEL32]: Cleanup/format/comment/annotate CreateHardLink*. Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] Tue Feb 21 19:18:57 2012 @@ -13,18 +13,17 @@ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ - /* * @implemented */ -BOOL WINAPI -CreateHardLinkW(LPCWSTR lpFileName, - LPCWSTR lpExistingFileName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) +BOOL +WINAPI +CreateHardLinkW(IN LPCWSTR lpFileName, + IN LPCWSTR lpExistingFileName, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { NTSTATUS Status; BOOL Ret = FALSE; @@ -33,12 +32,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hTarget = INVALID_HANDLE_VALUE; PFILE_LINK_INFORMATION LinkInformation = NULL; - UNICODE_STRING LinkTarget = {0, 0, NULL}, LinkName = {0, 0, NULL}; + UNICODE_STRING LinkTarget, LinkName; - TRACE("CreateHardLinkW: %S, %S, %p\n", lpFileName, lpExistingFileName, lpSecurityAttributes); + /* Initialize */ + LinkTarget.Buffer = LinkName.Buffer = NULL; /* Validate parameters */ - if(!lpFileName || !lpExistingFileName) + if (!(lpFileName) || !(lpExistingFileName)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -47,8 +47,12 @@ _SEH2_TRY { /* Get target UNC path */ - if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, NULL)) + if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, + &LinkTarget, + NULL, + NULL)) { + /* Set the error and fail */ SetLastError(ERROR_PATH_NOT_FOUND); _SEH2_LEAVE; } @@ -58,8 +62,9 @@ &LinkTarget, OBJ_CASE_INSENSITIVE, NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - + lpSecurityAttributes ? + lpSecurityAttributes->lpSecurityDescriptor : + NULL); Status = NtOpenFile(&hTarget, SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, &ObjectAttributes, @@ -68,6 +73,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT); if (!NT_SUCCESS(Status)) { + /* Convert the error and fail */ BaseSetLastNTError(Status); _SEH2_LEAVE; } @@ -75,95 +81,93 @@ /* Get UNC path name for link */ if (!RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, NULL)) { + /* Set the error and fail */ SetLastError(ERROR_PATH_NOT_FOUND); _SEH2_LEAVE; } - /* Prepare data for link */ + /* Allocate data for link */ NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length; LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, NeededSize); if (!LinkInformation) { + /* We're out of memory */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); _SEH2_LEAVE; } + /* Setup data for link and create it */ RtlMoveMemory(LinkInformation->FileName, LinkName.Buffer, LinkName.Length); LinkInformation->ReplaceIfExists = FALSE; LinkInformation->RootDirectory = 0; LinkInformation->FileNameLength = LinkName.Length; - - /* Create hard link */ Status = NtSetInformationFile(hTarget, &IoStatusBlock, LinkInformation, - NeededSize, + NeededSize, FileLinkInformation); if (NT_SUCCESS(Status)) { + /* Set success code */ Ret = TRUE; + } + else + { + /* Convert error code and return default (FALSE) */ + BaseSetLastNTError(Status); } } _SEH2_FINALLY { - if (LinkTarget.Buffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); - } - - if (hTarget != INVALID_HANDLE_VALUE) - { - NtClose(hTarget); - } - - if (LinkName.Buffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkName.Buffer); - } - - if (LinkInformation) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); - } + /* Cleanup all allocations */ + if (LinkTarget.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); + if (hTarget != INVALID_HANDLE_VALUE) NtClose(hTarget); + if (LinkName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, LinkName.Buffer); + if (LinkInformation) RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); } _SEH2_END; - return Ret; } /* * @implemented */ -BOOL WINAPI -CreateHardLinkA(LPCSTR lpFileName, - LPCSTR lpExistingFileName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) +BOOL +WINAPI +CreateHardLinkA(IN LPCSTR lpFileName, + IN LPCSTR lpExistingFileName, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) { BOOL Ret; PUNICODE_STRING lpFileNameW; UNICODE_STRING ExistingFileNameW; + /* Convert the filename to unicode, using MAX_PATH limitations */ lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); - if (!lpFileNameW) + if (!lpFileNameW) return FALSE; + + /* Check if there's an existing name as well */ + if (lpExistingFileName) { - return FALSE; + /* We're already using the static string above, so do this dynamically */ + if (!Basep8BitStringToDynamicUnicodeString(&ExistingFileNameW, + lpExistingFileName)) + { + /* Out of memory -- fail */ + return FALSE; + } + } + else + { + /* No existing file name */ + ExistingFileNameW.Buffer = NULL; } - if (!lpExistingFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!Basep8BitStringToDynamicUnicodeString(&ExistingFileNameW, lpExistingFileName)) - { - return FALSE; - } - - Ret = CreateHardLinkW(lpFileNameW->Buffer, ExistingFileNameW.Buffer, lpSecurityAttributes); - - RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW.Buffer); - + /* Call the Wide function, and then free our dynamic string */ + Ret = CreateHardLinkW(lpFileNameW->Buffer, + ExistingFileNameW.Buffer, + lpSecurityAttributes); + RtlFreeUnicodeString(&ExistingFileNameW); return Ret; }

1 0

[janderwald] 55789: [USBUHCI] - UHCI has 2 ports
by janderwald＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: janderwald Date: Tue Feb 21 18:53:04 2012 New Revision: 55789 URL: http://svn.reactos.org/svn/reactos?rev=55789&view=rev Log: [USBUHCI] - UHCI has 2 ports Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Tue Feb 21 18:53:04 2012 @@ -558,6 +558,11 @@ DPRINT1("[USBUHCI] InitializeController\n"); // + // UHCI has two ports + // + m_NumberOfPorts = 2; + + // // get bus interface // Status = GetBusInterface(m_PhysicalDeviceObject, &BusInterface);

1 0

[janderwald] 55788: [USBUHCI] - Implement starting the controller
by janderwald＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: janderwald Date: Tue Feb 21 18:33:37 2012 New Revision: 55788 URL: http://svn.reactos.org/svn/reactos?rev=55788&view=rev Log: [USBUHCI] - Implement starting the controller Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Tue Feb 21 18:33:37 2012 @@ -370,24 +370,12 @@ return Status; } - - // - // Stop the controller before modifying schedules - // - Status = StopController(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to stop the controller \n"); - ASSERT(FALSE); - return Status; - } - - // // Start the controller // DPRINT1("Starting Controller\n"); Status = StartController(); + // // done @@ -475,9 +463,60 @@ NTSTATUS CUSBHardwareDevice::StartController(void) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + USHORT Status; + + + // + // debug info + // + DPRINT1("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); + + // + // Set the run bit in the command register + // + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_RS); + + for(Index = 0; Index < 10; Index++) + { + // + // wait a bit + // + KeStallExecutionProcessor(100); + + // + // get controller status + // + Status = ReadRegister16(UHCI_USBSTS); + DPRINT1("[USBUHCI] Status %x\n", Status); + + if (!(Status & UHCI_USBSTS_HCHALT)) + { + // + // controller started + // + break; + } + } + + if ((Status & UHCI_USBSTS_HCHALT)) + { + // + // failed to start controller + // + DPRINT1("[USBUHCI] Failed to start controller Status %x\n", Status); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("[USBUHCI] Controller Started\n"); + DPRINT1("[USBUHCI] Controller Status %x\n", ReadRegister16(UHCI_USBSTS)); + DPRINT1("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); + + // + // done + // + return STATUS_SUCCESS; } VOID

1 0

[janderwald] 55787: [USBUHCI] - Implement function to retrieve queue head for the specified transfer type - Pass device speed to IUSBRequest initialization routines - Implementing inserting the new...
by janderwald＠svn.reactos.org 21 Feb '12

21 Feb '12

Author: janderwald Date: Tue Feb 21 18:19:24 2012 New Revision: 55787 URL: http://svn.reactos.org/svn/reactos?rev=55787&view=rev Log: [USBUHCI] - Implement function to retrieve queue head for the specified transfer type - Pass device speed to IUSBRequest initialization routines - Implementing inserting the new queue head into the required queue head - Implement support for control transfers, not yet used Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hardware.h trunk/reactos/drivers/usb/usbuhci/interfaces.h trunk/reactos/drivers/usb/usbuhci/usb_device.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -73,8 +73,9 @@ NTSTATUS GetPortStatus(ULONG PortId, OUT USHORT *PortStatus, OUT USHORT *PortChange); NTSTATUS ClearPortStatus(ULONG PortId, ULONG Status); NTSTATUS SetPortFeature(ULONG PortId, ULONG Feature); - VOID SetStatusChangeEndpointCallBack(PVOID CallBack, PVOID Context); + VOID GetQueueHead(ULONG QueueHeadIndex, PUHCI_QUEUE_HEAD *OutQueueHead); + KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); @@ -616,7 +617,7 @@ // // link queue heads // - m_QueueHead[Index-1]->LinkPhysical = m_QueueHead[Index]->LinkPhysical | QH_NEXT_IS_QH; + m_QueueHead[Index-1]->LinkPhysical = m_QueueHead[Index]->PhysicalAddress | QH_NEXT_IS_QH; m_QueueHead[Index-1]->NextLogicalDescriptor = m_QueueHead[Index]; } } @@ -1218,6 +1219,21 @@ return READ_PORT_ULONG((PULONG)((ULONG)m_Base + Register)); } +VOID +CUSBHardwareDevice::GetQueueHead( + IN ULONG QueueHeadIndex, + OUT PUHCI_QUEUE_HEAD *OutQueueHead) +{ + // + // sanity check + // + ASSERT(QueueHeadIndex < 5); + + // + // store queue head + // + *OutQueueHead = m_QueueHead[QueueHeadIndex]; +} VOID NTAPI Modified: trunk/reactos/drivers/usb/usbuhci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -163,7 +163,7 @@ } // Represents a Queue Head (QH) -typedef struct +typedef struct _UHCI_QUEUE_HEAD { // hardware part ULONG LinkPhysical; // address @@ -172,6 +172,8 @@ // Software part ULONG PhysicalAddress; PVOID NextLogicalDescriptor; + PVOID Request; + PVOID NextElementDescriptor; }UHCI_QUEUE_HEAD, *PUHCI_QUEUE_HEAD; #define QH_TERMINATE 0x01 Modified: trunk/reactos/drivers/usb/usbuhci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -107,7 +107,7 @@ typedef IHCDController *PHCDCONTROLLER; -struct _UHCI_TRANSFER_DESCRIPTOR; +struct _UHCI_QUEUE_HEAD; //========================================================================================= // // class IUSBHardwareDevice @@ -250,6 +250,15 @@ // Description: Used to callback to the hub controller when SCE detected // virtual VOID SetStatusChangeEndpointCallBack(PVOID CallBack,PVOID Context) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetQueueHead +// +// Description: gets a queue head with the specified queue head index +// + virtual VOID GetQueueHead(ULONG QueueHeadIndex, struct _UHCI_QUEUE_HEAD **OutQueueHead) = 0; + //----------------------------------------------------------------------------------------- // @@ -350,6 +359,7 @@ virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, + IN USB_DEVICE_SPEED DeviceSpeed, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) = 0; @@ -362,7 +372,8 @@ // The irp contains an URB block which contains all necessary information virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, - IN OUT PIRP Irp) = 0; + IN OUT PIRP Irp, + IN USB_DEVICE_SPEED DeviceSpeed) = 0; //----------------------------------------------------------------------------------------- // @@ -390,7 +401,7 @@ // // Description: returns the general transfer descriptor - virtual NTSTATUS GetEndpointDescriptor(struct _UHCI_TRANSFER_DESCRIPTOR ** OutDescriptor) = 0; + virtual NTSTATUS GetEndpointDescriptor(struct _UHCI_QUEUE_HEAD ** OutDescriptor) = 0; //----------------------------------------------------------------------------------------- // @@ -417,6 +428,14 @@ // Description: returns interval of the iso / interrupt virtual UCHAR GetInterval() = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDeviceSpeed +// +// Description: returns device speed + + virtual USB_DEVICE_SPEED GetDeviceSpeed() = 0; }; Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -462,7 +462,7 @@ // // initialize request // - Status = Request->InitializeWithIrp(m_DmaManager, Irp); + Status = Request->InitializeWithIrp(m_DmaManager, Irp, GetSpeed()); // // mark irp as pending @@ -550,7 +550,7 @@ // // initialize request // - Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, EndpointDescriptor, BufferLength, Mdl); + Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, GetSpeed(), EndpointDescriptor, BufferLength, Mdl); if (!NT_SUCCESS(Status)) { // Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -40,6 +40,9 @@ virtual NTSTATUS CancelRequests(); virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + // local + VOID LinkQueueHead(PUHCI_QUEUE_HEAD QueueHead, PUHCI_QUEUE_HEAD NextQueueHead); + // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} virtual ~CUSBQueue(){} @@ -104,9 +107,93 @@ CUSBQueue::AddUSBRequest( IUSBRequest * Request) { + PUHCI_QUEUE_HEAD NewQueueHead, QueueHead = NULL; + NTSTATUS Status; + DPRINT("CUSBQueue::AddUSBRequest\n"); - ASSERT(FALSE); + + // + // get queue head + // + Status = Request->GetEndpointDescriptor(&NewQueueHead); + if (!NT_SUCCESS(Status)) + { + // + // failed to create queue head + // + DPRINT1("[USBUHCI] Failed to create queue head %x\n", Status); + return Status; + } + + if (Request->GetTransferType() == USB_ENDPOINT_TYPE_CONTROL) + { + // + // get device speed + // + if (Request->GetDeviceSpeed() == UsbLowSpeed) + { + // + // use low speed queue + // + m_Hardware->GetQueueHead(UHCI_LOW_SPEED_CONTROL_QUEUE, &QueueHead); + } + else + { + // + // use full speed queue + // + m_Hardware->GetQueueHead(UHCI_FULL_SPEED_CONTROL_QUEUE, &QueueHead); + } + } + else if (Request->GetTransferType() == USB_ENDPOINT_TYPE_BULK) + { + // + // use full speed queue + // + m_Hardware->GetQueueHead(UHCI_BULK_QUEUE, &QueueHead); + } + else if (Request->GetTransferType() == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // use full speed queue + // + m_Hardware->GetQueueHead(UHCI_INTERRUPT_QUEUE, &QueueHead); + } + else if (Request->GetTransferType() == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // use full speed queue + // + m_Hardware->GetQueueHead(UHCI_INTERRUPT_QUEUE, &QueueHead); + } + + // + // FIXME support isochronous + // + ASSERT(QueueHead); + + // + // add reference + // + Request->AddRef(); + + // + // now link the new queue head + // + LinkQueueHead(QueueHead, NewQueueHead); return STATUS_SUCCESS; +} + +VOID +CUSBQueue::LinkQueueHead( + IN PUHCI_QUEUE_HEAD QueueHead, + IN PUHCI_QUEUE_HEAD NextQueueHead) +{ + NextQueueHead->LinkPhysical = QueueHead->LinkPhysical; + NextQueueHead->NextLogicalDescriptor = QueueHead->NextLogicalDescriptor; + + QueueHead->LinkPhysical = NextQueueHead->PhysicalAddress | QH_NEXT_IS_QH; + QueueHead->NextLogicalDescriptor = (PVOID)NextQueueHead; } NTSTATUS Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Tue Feb 21 18:19:24 2012 @@ -36,15 +36,16 @@ } // IUSBRequest interface functions - virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); - virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp); + virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN USB_DEVICE_SPEED DeviceSpeed, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); + virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp, IN USB_DEVICE_SPEED DeviceSpeed); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); - virtual NTSTATUS GetEndpointDescriptor(struct _UHCI_TRANSFER_DESCRIPTOR ** OutEndpointDescriptor); + virtual NTSTATUS GetEndpointDescriptor(struct _UHCI_QUEUE_HEAD ** OutQueueHead); virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS *NtStatusCode, OUT OPTIONAL PULONG UrbStatusCode); virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); virtual UCHAR GetInterval(); + virtual USB_DEVICE_SPEED GetDeviceSpeed(); // local functions @@ -55,6 +56,13 @@ NTSTATUS BuildSetupPacketFromURB(); UCHAR GetEndpointAddress(); USHORT GetMaxPacketSize(); + NTSTATUS CreateDescriptor(PUHCI_TRANSFER_DESCRIPTOR *OutDescriptor, IN UCHAR PidCode, ULONG BufferLength); + NTSTATUS BuildControlTransferDescriptor(IN PUHCI_QUEUE_HEAD * OutQueueHead); + NTSTATUS BuildQueueHead(OUT PUHCI_QUEUE_HEAD *OutQueueHead); + VOID FreeDescriptor(IN PUHCI_TRANSFER_DESCRIPTOR Descriptor); + NTSTATUS BuildTransferDescriptorChain(IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, IN UCHAR InitialDataToggle, OUT PUHCI_TRANSFER_DESCRIPTOR * OutFirstDescriptor, OUT PUHCI_TRANSFER_DESCRIPTOR * OutLastDescriptor, OUT PULONG OutTransferBufferOffset, OUT PUCHAR OutDataToggle); + + // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -124,6 +132,11 @@ // NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; + + // + // store device speed + // + USB_DEVICE_SPEED m_DeviceSpeed; }; @@ -143,6 +156,7 @@ IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, + IN USB_DEVICE_SPEED DeviceSpeed, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) @@ -163,6 +177,7 @@ m_DeviceAddress = DeviceAddress; m_EndpointDescriptor = EndpointDescriptor; m_TotalBytesTransferred = 0; + m_DeviceSpeed = DeviceSpeed; // // Set Length Completed to 0 @@ -195,7 +210,8 @@ NTSTATUS CUSBRequest::InitializeWithIrp( IN PDMAMEMORYMANAGER DmaManager, - IN OUT PIRP Irp) + IN OUT PIRP Irp, + IN USB_DEVICE_SPEED DeviceSpeed) { PIO_STACK_LOCATION IoStack; PURB Urb; @@ -208,6 +224,7 @@ m_DmaManager = DmaManager; m_TotalBytesTransferred = 0; + m_DeviceSpeed = DeviceSpeed; // // get current irp stack location @@ -514,13 +531,21 @@ UCHAR CUSBRequest::InternalGetPidDirection() { - ASSERT(m_Irp); - ASSERT(m_EndpointDescriptor); - - // - // end point is defined in the low byte of bEndpointAddress - // - return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + if (m_EndpointDescriptor) + { + // + // end point direction is highest bit in bEndpointAddress + // + return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + } + else + { + // + // request arrives on the control pipe, extract direction from setup packet + // + ASSERT(m_SetupPacket); + return (m_SetupPacket->bmRequestType.B >> 7); + } } @@ -578,13 +603,35 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBRequest::GetEndpointDescriptor( - struct _UHCI_TRANSFER_DESCRIPTOR ** OutDescriptor) -{ - ASSERT(FALSE); + struct _UHCI_QUEUE_HEAD ** OutQueueHead) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + if (InternalGetTransferType() == USB_ENDPOINT_TYPE_CONTROL) + { + // + // build queue head + // + Status = BuildControlTransferDescriptor(OutQueueHead); + } + + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store result + // + (*OutQueueHead)->Request = PVOID(this); + // // done // - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } //---------------------------------------------------------------------------------------- @@ -647,8 +694,442 @@ UNIMPLEMENTED return TRUE; } - - +//----------------------------------------------------------------------------------------- +NTSTATUS +CUSBRequest::CreateDescriptor( + OUT PUHCI_TRANSFER_DESCRIPTOR *OutDescriptor, + IN UCHAR PidCode, + ULONG BufferLength) +{ + PUHCI_TRANSFER_DESCRIPTOR Descriptor; + PHYSICAL_ADDRESS Address; + NTSTATUS Status; + + // + // allocate descriptor + // + Status = m_DmaManager->Allocate(sizeof(UHCI_TRANSFER_DESCRIPTOR), (PVOID*)&Descriptor, &Address); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[USBUHCI] Failed to allocate descriptor\n"); + return Status; + } + + // + // init descriptor + // + Descriptor->PhysicalAddress = Address; + Descriptor->Status = TD_STATUS_ACTIVE; + + if (InternalGetTransferType() == USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // isochronous transfer descriptor + // + Descriptor->Status |= TD_CONTROL_ISOCHRONOUS; + } + else + { + // + // error count + // + Descriptor->Status |= TD_CONTROL_3_ERRORS; + + if (PidCode == TD_TOKEN_IN && (InternalGetTransferType() != USB_ENDPOINT_TYPE_CONTROL)) + { + // + // enable short packet detect for bulk & interrupt + // + Descriptor->Status |= TD_CONTROL_SPD; + } + } + + // + // is it low speed device + // + if (m_DeviceSpeed == UsbLowSpeed) + { + // + // low speed device + // + Descriptor->Status |= TD_CONTROL_LOWSPEED; + } + + // + // store buffer size + // + Descriptor->BufferSize = BufferLength; + + // + // is there a buffer + // + if(BufferLength) + { + // + // store buffer length + // + Descriptor->Token = (BufferLength - 1) << TD_TOKEN_MAXLEN_SHIFT; + } + else + { + // + // no buffer magic constant + // + Descriptor->Token = TD_TOKEN_NULL_DATA; + } + + // + // store address & endpoint number + // + Descriptor->Token |= GetEndpointAddress() << TD_TOKEN_ENDPTADDR_SHIFT; + Descriptor->Token |= GetDeviceAddress() << 8 | PidCode; + + if (BufferLength) + { + // + // allocate buffer for descriptor + // + Status = m_DmaManager->Allocate(BufferLength, (PVOID*)&Descriptor->BufferLogical, &Address); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[USBUHCI] Failed to allocate descriptor buffer length %lu\n", BufferLength); + m_DmaManager->Release(Descriptor, sizeof(UHCI_TRANSFER_DESCRIPTOR)); + return Status; + } + + // + // store address + // + Descriptor->BufferPhysical = Address.LowPart; + } + + // + // done + // + *OutDescriptor = Descriptor; + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBRequest::BuildTransferDescriptorChain( + IN PVOID TransferBuffer, + IN ULONG TransferBufferLength, + IN UCHAR PidCode, + IN UCHAR InitialDataToggle, + OUT PUHCI_TRANSFER_DESCRIPTOR * OutFirstDescriptor, + OUT PUHCI_TRANSFER_DESCRIPTOR * OutLastDescriptor, + OUT PULONG OutTransferBufferOffset, + OUT PUCHAR OutDataToggle) +{ + PUHCI_TRANSFER_DESCRIPTOR FirstDescriptor = NULL, CurrentDescriptor, LastDescriptor = NULL; + UCHAR TransferBufferOffset = 0; + NTSTATUS Status; + ULONG MaxPacketSize, CurrentBufferSize; + + // + // FIXME FIXME FIXME FIXME FIXME + // + MaxPacketSize = 64; + + do + { + // + // determine current packet size + // + CurrentBufferSize = min(MaxPacketSize, TransferBufferLength - TransferBufferOffset); + + // + // allocate descriptor + // + Status = CreateDescriptor(&CurrentDescriptor, PidCode, CurrentBufferSize); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate queue head + // + DPRINT1("[UHCI] Failed to create descriptor\n"); + ASSERT(FALSE); + return Status; + } + + if (PidCode == TD_TOKEN_OUT) + { + // + // copy buffer + // + RtlCopyMemory(CurrentDescriptor->BufferLogical, TransferBuffer, CurrentBufferSize); + } + + if (!FirstDescriptor) + { + // + // first descriptor + // + FirstDescriptor = CurrentDescriptor; + } + else + { + // + // link descriptor + // + LastDescriptor->LinkPhysical = CurrentDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + LastDescriptor->NextLogicalDescriptor = (PVOID)CurrentDescriptor; + } + + if (InitialDataToggle) + { + // + // apply data toggle + // + CurrentDescriptor->Token |= TD_TOKEN_DATA1; + } + + // + // re-run + // + LastDescriptor = CurrentDescriptor; + TransferBufferOffset += CurrentBufferSize; + InitialDataToggle = !InitialDataToggle; + + }while(TransferBufferOffset < TransferBufferLength); + + if (OutTransferBufferOffset) + { + // + // store transfer buffer length + // + *OutTransferBufferOffset = TransferBufferOffset; + } + + if (OutFirstDescriptor) + { + // + // store first descriptor + // + *OutFirstDescriptor = FirstDescriptor; + } + + if (OutLastDescriptor) + { + // + // store last descriptor + // + *OutLastDescriptor = CurrentDescriptor; + } + + if (OutDataToggle) + { + // + // store data toggle + // + *OutDataToggle = InitialDataToggle; + } + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBRequest::BuildQueueHead( + OUT PUHCI_QUEUE_HEAD *OutQueueHead) +{ + PUHCI_QUEUE_HEAD QueueHead; + NTSTATUS Status; + PHYSICAL_ADDRESS Address; + + // + // allocate queue head + // + Status = m_DmaManager->Allocate(sizeof(UHCI_QUEUE_HEAD), (PVOID*)&QueueHead, &Address); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate queue head + // + DPRINT1("[UHCI] Failed to create queue head\n"); + return Status; + } + + // + // store address + // + QueueHead->PhysicalAddress = Address.LowPart; + QueueHead->ElementPhysical = Address.LowPart; + + // + // store result + // + *OutQueueHead = QueueHead; + return STATUS_SUCCESS; +} + +VOID +CUSBRequest::FreeDescriptor( + IN PUHCI_TRANSFER_DESCRIPTOR Descriptor) +{ + if (Descriptor->BufferLogical) + { + // + // free buffer + // + m_DmaManager->Release(Descriptor->BufferLogical, Descriptor->BufferSize); + } + + // + // free descriptors + // + m_DmaManager->Release(Descriptor, sizeof(UHCI_TRANSFER_DESCRIPTOR)); +} + +NTSTATUS +CUSBRequest::BuildControlTransferDescriptor( + IN PUHCI_QUEUE_HEAD * OutQueueHead) +{ + PUHCI_TRANSFER_DESCRIPTOR SetupDescriptor, StatusDescriptor, FirstDescriptor, LastDescriptor; + PUHCI_QUEUE_HEAD QueueHead; + BOOLEAN Direction; + NTSTATUS Status; + ULONG ChainDescriptorLength; + + // + // create queue head + // + Status = BuildQueueHead(&QueueHead); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create queue head\n"); + return Status; + } + + // + // get direction + // + Direction = InternalGetPidDirection(); + + // + // build setup descriptor + // + Status = CreateDescriptor(&SetupDescriptor, + TD_TOKEN_SETUP, + sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create setup descriptor\n"); + m_DmaManager->Release(QueueHead, sizeof(UHCI_QUEUE_HEAD)); + return Status; + } + + // + // build status descriptor + // + Status = CreateDescriptor(&StatusDescriptor, + Direction ? TD_TOKEN_OUT : TD_TOKEN_IN, + 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create setup descriptor\n"); + FreeDescriptor(SetupDescriptor); + m_DmaManager->Release(QueueHead, sizeof(UHCI_QUEUE_HEAD)); + return Status; + } + + if (m_SetupPacket) + { + // + // copy setup packet + // + RtlCopyMemory(SetupDescriptor->BufferLogical, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + else + { + // + // generate setup packet from urb + // + ASSERT(FALSE); + } + + // + // init status descriptor + // + StatusDescriptor->Status |= TD_CONTROL_IOC; + StatusDescriptor->Token |= TD_TOKEN_DATA1; + StatusDescriptor->LinkPhysical = TD_TERMINATE; + StatusDescriptor->NextLogicalDescriptor = NULL; + + if (m_TransferBufferLength) + { + // + // create descriptor chain + // + Status = BuildTransferDescriptorChain(MmGetMdlVirtualAddress(m_TransferBufferMDL), + m_TransferBufferLength, + Direction ? TD_TOKEN_IN : TD_TOKEN_OUT, + FALSE, + &FirstDescriptor, + &LastDescriptor, + &ChainDescriptorLength, + NULL); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate descriptor + // + DPRINT1("[UHCI] Failed to create descriptor chain\n"); + FreeDescriptor(SetupDescriptor); + FreeDescriptor(StatusDescriptor); + m_DmaManager->Release(QueueHead, sizeof(UHCI_QUEUE_HEAD)); + return Status; + } + + // + // link setup descriptor to first data descriptor + // + SetupDescriptor->LinkPhysical = FirstDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + SetupDescriptor->NextLogicalDescriptor = (PVOID)FirstDescriptor; + + // + // link last data descriptor to status descriptor + // + LastDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + LastDescriptor->NextLogicalDescriptor = (PVOID)StatusDescriptor; + } + else + { + // + // directly link setup to status descriptor + // + SetupDescriptor->LinkPhysical = StatusDescriptor->PhysicalAddress.LowPart | TD_DEPTH_FIRST; + SetupDescriptor->NextLogicalDescriptor = (PVOID)StatusDescriptor; + } + + // + // link queue head with setup descriptor + // + QueueHead->NextElementDescriptor = (PVOID)SetupDescriptor; + QueueHead->ElementPhysical = SetupDescriptor->PhysicalAddress.LowPart; + + // + // store result + // + *OutQueueHead = QueueHead; + return STATUS_SUCCESS; +} +USB_DEVICE_SPEED +CUSBRequest::GetDeviceSpeed() +{ + return m_DeviceSpeed; +} //----------------------------------------------------------------------------------------- NTSTATUS

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