Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by greatlrd＠svn.reactos.com

Fix CD bug for CD "program files" cd did only working with CD program files now it support "" Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-05-19 05:26:35 UTC (rev 15409) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-05-19 15:32:22 UTC (rev 15410) @@ -156,8 +156,7 @@ { LPTSTR dir; /* pointer to the directory to change to */ LPTSTR lpOldPath; - LPTSTR endofstring; /* pointer to the null character in the directory to change to */ - LPTSTR lastquote; /* pointer to the last quotation mark in the directory to change to */ + size_t size, str_len; /*Should we better declare a variable containing _tsclen(dir) ? It's used a few times, but on the other hand paths are generally not very long*/ @@ -171,17 +170,29 @@ /* The whole param string is our parameter these days. The only thing we do is eliminating every quotation mark */ /* Is it safe to change the characters param is pointing to? I presume it is, as there doesn't seem to be any post-processing of it after the function call (what would that accomplish?) */ + + size = _tcscspn(param, _T("\"") ); + str_len = _tcslen(param)-1; - dir=param; - endofstring=dir+_tcslen(dir); + if ((param[size] == _T('"')) && (str_len >1)) + { + + if (size==0) + { + _tcsncpy(param,&param[size+1],str_len); + param[str_len] = _T('\0'); + } - while ((lastquote = _tcsrchr(dir, _T('\"')))) - { - endofstring--; - memmove(lastquote,lastquote+1,endofstring-lastquote); - *endofstring=_T('\0'); + size = _tcscspn(param, _T("\"") ); + if (param[size] == _T('"')) + { + param[size] = _T('\0'); + } + } - + + dir=param; + /* if doing a CD and no parameters given, print out current directory */ if (!dir || !dir[0]) {

19 years, 4 months

[ion] 15409: Unnamed objects do not have a base directory.

by ion＠svn.reactos.com

Unnamed objects do not have a base directory. Modified: trunk/reactos/lib/kernel32/mem/section.c Modified: trunk/reactos/lib/kernel32/synch/event.c Modified: trunk/reactos/lib/kernel32/synch/mutex.c Modified: trunk/reactos/lib/kernel32/synch/sem.c Modified: trunk/reactos/lib/kernel32/synch/timer.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/lib/kernel32/mem/section.c --- trunk/reactos/lib/kernel32/mem/section.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/lib/kernel32/mem/section.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), SecurityDescriptor); Status = NtCreateSection(&SectionHandle, @@ -155,7 +155,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), SecurityDescriptor); Status = NtCreateSection(&SectionHandle, _____ Modified: trunk/reactos/lib/kernel32/synch/event.c --- trunk/reactos/lib/kernel32/synch/event.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/lib/kernel32/synch/event.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpEventAttributes != NULL) _____ Modified: trunk/reactos/lib/kernel32/synch/mutex.c --- trunk/reactos/lib/kernel32/synch/mutex.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/lib/kernel32/synch/mutex.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -76,7 +76,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpMutexAttributes != NULL) _____ Modified: trunk/reactos/lib/kernel32/synch/sem.c --- trunk/reactos/lib/kernel32/synch/sem.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/lib/kernel32/synch/sem.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpSemaphoreAttributes != NULL) _____ Modified: trunk/reactos/lib/kernel32/synch/timer.c --- trunk/reactos/lib/kernel32/synch/timer.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/lib/kernel32/synch/timer.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -38,7 +38,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpTimerName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpTimerName ? hBaseDir : NULL), NULL); if (lpTimerAttributes != NULL) _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -278,7 +278,7 @@ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { /* Get the Device Object */ - DPRINT1("here\n"); + DPRINT("here\n"); DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); /* Assign the Security Descriptor */ _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-19 03:36:20 UTC (rev 15408) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-19 05:26:35 UTC (rev 15409) @@ -74,7 +74,11 @@ } /* Fail if anything up to here died */ - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Probing failed\n"); + return Status; + } } else { @@ -228,14 +232,12 @@ } else { - #if 0 /*FIXME: FIX KERNEL32 and STUFF!!! */ /* He can't have specified a Root Directory */ if (ObjectCreateInfo->RootDirectory) { DPRINT1("Invalid name\n"); Status = STATUS_OBJECT_NAME_INVALID; } - #endif } fail:

19 years, 4 months

[arty] 15408: Don't free this MDL. The I/O manager now does it for us.

by arty＠svn.reactos.com

Don't free this MDL. The I/O manager now does it for us. Modified: trunk/reactos/drivers/net/afd/afd/info.c _____ Modified: trunk/reactos/drivers/net/afd/afd/info.c --- trunk/reactos/drivers/net/afd/afd/info.c 2005-05-19 03:24:43 UTC (rev 15407) +++ trunk/reactos/drivers/net/afd/afd/info.c 2005-05-19 03:36:20 UTC (rev 15408) @@ -141,7 +141,7 @@ } /* MmUnlockPages( Mdl ); */ - IoFreeMdl( Mdl ); + /* IoFreeMdl( Mdl ); */ } else { Status = STATUS_INSUFFICIENT_RESOURCES; }

19 years, 4 months

[ion] 15407: Don't free io completion packet twice

by ion＠svn.reactos.com

Don't free io completion packet twice Modified: trunk/reactos/ntoskrnl/io/iocomp.c _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-19 02:53:52 UTC (rev 15406) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-19 03:24:43 UTC (rev 15407) @@ -514,9 +514,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - - /* Free packet */ - ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet); } /* Dereference the Object */

19 years, 4 months

[arty] 15406: Corrected uninitialized timeout variable. Will be needed later when ARP calls

by arty＠svn.reactos.com

Corrected uninitialized timeout variable. Will be needed later when ARP calls are present in iphlpapi. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-05-19 01:58:24 UTC (rev 15405) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-05-19 02:53:52 UTC (rev 15406) @@ -71,7 +71,7 @@ #define middlechar(c) (borderchar(c) || hyphenchar(c)) #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) -unsigned long debug_trace_level = DEBUG_ULTRA; +unsigned long debug_trace_level = 0; /* DEBUG_ULTRA */ time_t cur_time; time_t default_lease_time = 43200; /* 12 hours... */ @@ -661,7 +661,7 @@ struct interface_info *ip = packet->interface; struct client_lease *lease, *lp; int i; - int arp_timeout_needed, stop_selecting; + int arp_timeout_needed = 0, stop_selecting; char *name = packet->options[DHO_DHCP_MESSAGE_TYPE].len ? "DHCPOFFER" : "BOOTREPLY";

19 years, 4 months

[ion] 15405: fix boot on vmware

by ion＠svn.reactos.com

fix boot on vmware Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-19 01:46:49 UTC (rev 15404) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-19 01:58:24 UTC (rev 15405) @@ -218,7 +218,7 @@ { return Status; } - + Status = ObInsertObject(Object, NULL, FILE_ALL_ACCESS, @@ -229,7 +229,9 @@ { return Status; } - + + /* This function shouldn't be called twice for the same driver anyways..why is it? */ +#if 0 if (Status == STATUS_OBJECT_EXISTS) { /* The driver object already exists, so it is already @@ -237,7 +239,7 @@ *DriverObject = Object; return STATUS_SUCCESS; } - +#endif /* Create driver extension */ Object->DriverExtension = (PDRIVER_EXTENSION) ExAllocatePoolWithTag(

19 years, 4 months

[ion] 15404: fix compiling

by ion＠svn.reactos.com

fix compiling Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 00:59:40 UTC (rev 15403) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-19 01:46:49 UTC (rev 15404) @@ -60,7 +60,7 @@ { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); ULONG Length; - PVOID Data; + PVOID Data = NULL; PWSTR Ptr; DPRINT("IoGetDeviceProperty(%x %d)\n", DeviceObject, DeviceProperty);

19 years, 4 months

[Phreak] 15403: Rewrote usetup's file copy and cabinet extraction code to use memory mapped files

by Phreak＠svn.reactos.com

Rewrote usetup's file copy and cabinet extraction code to use memory mapped files This increased performance and the code is cleaner Still needs a bit more cleaning up, but so far, looks good, needs some testing Modified: trunk/reactos/subsys/system/usetup/cabinet.c Modified: trunk/reactos/subsys/system/usetup/cabinet.h Modified: trunk/reactos/subsys/system/usetup/filesup.c _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-18 22:05:11 UTC (rev 15402) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-19 00:59:40 UTC (rev 15403) @@ -46,30 +46,21 @@ static WCHAR DiskNext[256]; // Label of cabinet in file CabinetNext static ULONG FolderUncompSize = 0; // Uncompressed size of folder static ULONG BytesLeftInBlock = 0; // Number of bytes left in current block -static BOOL ReuseBlock = FALSE; static WCHAR DestPath[MAX_PATH]; static HANDLE FileHandle; +static HANDLE FileSectionHandle; +static PUCHAR FileBuffer; +static ULONG DestFileSize; +static ULONG FileSize; static BOOL FileOpen = FALSE; -static CFHEADER CABHeader; +static PCFHEADER PCABHeader; +static PCFFOLDER CabinetFolders; static ULONG CabinetReserved = 0; static ULONG FolderReserved = 0; static ULONG DataReserved = 0; -static PCFFOLDER_NODE FolderListHead = NULL; -static PCFFOLDER_NODE FolderListTail = NULL; -static PCFFOLDER_NODE CurrentFolderNode = NULL; -static PCFDATA_NODE CurrentDataNode = NULL; -static PCFFILE_NODE FileListHead = NULL; -static PCFFILE_NODE FileListTail = NULL; static ULONG CodecId; static PCABINET_CODEC_UNCOMPRESS CodecUncompress = NULL; static BOOL CodecSelected = FALSE; -static PVOID InputBuffer = NULL; -static PVOID CurrentIBuffer = NULL; // Current offset in input buffer -static ULONG CurrentIBufferSize = 0; // Bytes left in input buffer -static PVOID OutputBuffer = NULL; -static PVOID CurrentOBuffer = NULL; // Current offset in output buffer -static ULONG CurrentOBufferSize = 0; // Bytes left in output buffer -static BOOL RestartSearch = FALSE; static ULONG LastFileOffset = 0; // Uncompressed offset of last extracted file static PCABINET_OVERWRITE OverwriteHandler = NULL; static PCABINET_EXTRACT ExtractHandler = NULL; @@ -94,20 +85,23 @@ ULONG RawCodecUncompress(PVOID OutputBuffer, - PVOID InputBuffer, - ULONG InputLength, - PULONG OutputLength) + PVOID InputBuffer, + PLONG InputLength, + PLONG OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: * OutputBuffer = Pointer to buffer to place uncompressed data * InputBuffer = Pointer to buffer with data to be uncompressed - * InputLength = Length of input buffer - * OutputLength = Address of buffer to place size of uncompressed data + * InputLength = Length of input buffer before, and amount consumed after + * Negative to indicate that this is not the start of a new block + * OutputLength = Length of output buffer before, amount filled after + * Negative to indicate that this is not the end of the block */ { - memcpy(OutputBuffer, InputBuffer, InputLength); - *OutputLength = InputLength; + LONG In = abs(*InputLength), Out = abs(*OutputLength); + memcpy(OutputBuffer, InputBuffer, In < Out ? In : Out); + *InputLength = *OutputLength = In < Out ? In : Out; return CS_SUCCESS; } @@ -116,70 +110,80 @@ ULONG MSZipCodecUncompress(PVOID OutputBuffer, - PVOID InputBuffer, - ULONG InputLength, - PULONG OutputLength) + PVOID InputBuffer, + PLONG InputLength, + PLONG OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: * OutputBuffer = Pointer to buffer to place uncompressed data * InputBuffer = Pointer to buffer with data to be uncompressed - * InputLength = Length of input buffer - * OutputLength = Address of buffer to place size of uncompressed data + * InputLength = Length of input buffer before, and amount consumed after + * Negative to indicate that this is not the start of a new block + * OutputLength = Length of output buffer before, amount filled after + * Negative to indicate that this is not the end of the block */ { USHORT Magic; INT Status; - DPRINT("InputLength (%d).\n", InputLength); + DPRINT("MSZipCodecUncompress( OutputBuffer = %x, InputBuffer = %x, InputLength = %d, OutputLength = %d.\n", OutputBuffer, InputBuffer, *InputLength, *OutputLength); + if( *InputLength > 0 ) + { + Magic = *((PUSHORT)InputBuffer); - Magic = *((PUSHORT)InputBuffer); + if (Magic != MSZIP_MAGIC) + { + DPRINT("Bad MSZIP block header magic (0x%X)\n", Magic); + return CS_BADSTREAM; + } + + ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); + ZStream.avail_in = *InputLength - 2; + ZStream.next_out = (PUCHAR)OutputBuffer; + ZStream.avail_out = abs(*OutputLength); - if (Magic != MSZIP_MAGIC) - { - DPRINT("Bad MSZIP block header magic (0x%X)\n", Magic); - return CS_BADSTREAM; - } + /* WindowBits is passed < 0 to tell that there is no zlib header. + * Note that in this case inflate *requires* an extra "dummy" byte + * after the compressed stream in order to complete decompression and + * return Z_STREAM_END. + */ + Status = inflateInit2(&ZStream, -MAX_WBITS); + if (Status != Z_OK) + { + DPRINT("inflateInit2() returned (%d).\n", Status); + return CS_BADSTREAM; + } + ZStream.total_in = 2; + } + else { + ZStream.avail_in = -*InputLength; + ZStream.next_in = (PUCHAR)InputBuffer; + ZStream.next_out = (PUCHAR)OutputBuffer; + ZStream.avail_out = abs(*OutputLength); + ZStream.total_in = 0; + } + ZStream.total_out = 0; + Status = inflate(&ZStream, Z_SYNC_FLUSH ); + if (Status != Z_OK && Status != Z_STREAM_END) + { + DPRINT("inflate() returned (%d) (%s).\n", Status, ZStream.msg); + if (Status == Z_MEM_ERROR) + return CS_NOMEMORY; + return CS_BADSTREAM; + } - ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); - ZStream.avail_in = InputLength - 2; - ZStream.next_out = (PUCHAR)OutputBuffer; - ZStream.avail_out = CAB_BLOCKSIZE + 12; - - /* WindowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and - * return Z_STREAM_END. - */ - Status = inflateInit2(&ZStream, -MAX_WBITS); - if (Status != Z_OK) - { - DPRINT("inflateInit2() returned (%d).\n", Status); - return CS_BADSTREAM; - } - - while ((ZStream.total_out < CAB_BLOCKSIZE + 12) && - (ZStream.total_in < InputLength - 2)) - { - Status = inflate(&ZStream, Z_NO_FLUSH); - if (Status == Z_STREAM_END) break; - if (Status != Z_OK) - { - DPRINT("inflate() returned (%d) (%s).\n", Status, ZStream.msg); - if (Status == Z_MEM_ERROR) - return CS_NOMEMORY; - return CS_BADSTREAM; - } - } - + if( *OutputLength > 0 ) + { + Status = inflateEnd(&ZStream); + if (Status != Z_OK) + { + DPRINT("inflateEnd() returned (%d).\n", Status); + return CS_BADSTREAM; + } + } *OutputLength = ZStream.total_out; - - Status = inflateEnd(&ZStream); - if (Status != Z_OK) - { - DPRINT("inflateEnd() returned (%d).\n", Status); - return CS_BADSTREAM; - } + *InputLength = ZStream.total_in; return CS_SUCCESS; } @@ -197,97 +201,14 @@ RtlFreeHeap(ProcessHeap, 0, address); } - -static DWORD -SeekInFile(HANDLE hFile, - LONG lDistanceToMove, - PLONG lpDistanceToMoveHigh, - DWORD dwMoveMethod, - PNTSTATUS Status) -{ - FILE_POSITION_INFORMATION FilePosition; - FILE_STANDARD_INFORMATION FileStandard; - NTSTATUS errCode; - IO_STATUS_BLOCK IoStatusBlock; - LARGE_INTEGER Distance; - - DPRINT("SeekInFile(hFile %x, lDistanceToMove %d, dwMoveMethod %d)\n", - hFile,lDistanceToMove,dwMoveMethod); - - Distance.u.LowPart = lDistanceToMove; - if (lpDistanceToMoveHigh) - { - Distance.u.HighPart = *lpDistanceToMoveHigh; - } - else if (lDistanceToMove >= 0) - { - Distance.u.HighPart = 0; - } - else - { - Distance.u.HighPart = -1; - } - - if (dwMoveMethod == SEEK_CURRENT) - { - NtQueryInformationFile(hFile, - &IoStatusBlock, - &FilePosition, - sizeof(FILE_POSITION_INFORMATION), - FilePositionInformation); - FilePosition.CurrentByteOffset.QuadPart += Distance.QuadPart; - } - else if (dwMoveMethod == SEEK_END) - { - NtQueryInformationFile(hFile, - &IoStatusBlock, - &FileStandard, - sizeof(FILE_STANDARD_INFORMATION), - FileStandardInformation); - FilePosition.CurrentByteOffset.QuadPart = - FileStandard.EndOfFile.QuadPart + Distance.QuadPart; - } - else if ( dwMoveMethod == SEEK_BEGIN ) - { - FilePosition.CurrentByteOffset.QuadPart = Distance.QuadPart; - } - -// DPRINT1("GOTO FILE OFFSET: %I64d\n", FilePosition.CurrentByteOffset.QuadPart); - - errCode = NtSetInformationFile(hFile, - &IoStatusBlock, - &FilePosition, - sizeof(FILE_POSITION_INFORMATION), - FilePositionInformation); - if (!NT_SUCCESS(errCode)) - { - if (Status != NULL) - { - *Status = errCode; - } - return -1; - } - - if (lpDistanceToMoveHigh != NULL) - { - *lpDistanceToMoveHigh = FilePosition.CurrentByteOffset.u.HighPart; - } - if (Status != NULL) - { - *Status = STATUS_SUCCESS; - } - return FilePosition.CurrentByteOffset.u.LowPart; -} - - static BOOL ConvertSystemTimeToFileTime( - CONST SYSTEMTIME * lpSystemTime, + CONST SYSTEMTIME * lpSystemTime, LPFILETIME lpFileTime) { TIME_FIELDS TimeFields; LARGE_INTEGER liTime; - + TimeFields.Year = lpSystemTime->wYear; TimeFields.Month = lpSystemTime->wMonth; TimeFields.Day = lpSystemTime->wDay; @@ -295,7 +216,7 @@ TimeFields.Minute = lpSystemTime->wMinute; TimeFields.Second = lpSystemTime->wSecond; TimeFields.Milliseconds = lpSystemTime->wMilliseconds; - + if (RtlTimeFieldsToTime(&TimeFields, &liTime)) { lpFileTime->dwLowDateTime = liTime.u.LowPart; @@ -315,21 +236,21 @@ PDOSTIME pdtime = (PDOSTIME) &wFatTime; PDOSDATE pddate = (PDOSDATE) &wFatDate; SYSTEMTIME SystemTime; - + if (lpFileTime == NULL) return FALSE; - + SystemTime.wMilliseconds = 0; SystemTime.wSecond = pdtime->Second; SystemTime.wMinute = pdtime->Minute; SystemTime.wHour = pdtime->Hour; - + SystemTime.wDay = pddate->Day; SystemTime.wMonth = pddate->Month; SystemTime.wYear = 1980 + pddate->Year; - + ConvertSystemTimeToFileTime(&SystemTime,lpFileTime); - + return TRUE; } @@ -345,9 +266,9 @@ */ { ULONG i, j; - + j = i = 0; - + while (Path [i++]) { if (Path[i - 1] == L'\\') j = i; @@ -366,10 +287,10 @@ { PWCHAR FileName; DWORD i; - + i = 0; FileName = GetFileName(Path + i); - + if ((FileName != (Path + i)) && (FileName [-1] == L'\\')) FileName--; if ((FileName == (Path + i)) && (FileName [0] == L'\\')) @@ -379,7 +300,7 @@ static BOOL -SetAttributesOnFile(PCFFILE_NODE File, HANDLE hFile) +SetAttributesOnFile(PCFFILE File, HANDLE hFile) /* * FUNCTION: Sets attributes on a file * ARGUMENTS: @@ -393,19 +314,19 @@ NTSTATUS NtStatus; ULONG Attributes = 0; - if (File->File.Attributes & CAB_ATTRIB_READONLY) + if (File->Attributes & CAB_ATTRIB_READONLY) Attributes |= FILE_ATTRIBUTE_READONLY; - if (File->File.Attributes & CAB_ATTRIB_HIDDEN) + if (File->Attributes & CAB_ATTRIB_HIDDEN) Attributes |= FILE_ATTRIBUTE_HIDDEN; - if (File->File.Attributes & CAB_ATTRIB_SYSTEM) + if (File->Attributes & CAB_ATTRIB_SYSTEM) Attributes |= FILE_ATTRIBUTE_SYSTEM; - if (File->File.Attributes & CAB_ATTRIB_DIRECTORY) + if (File->Attributes & CAB_ATTRIB_DIRECTORY) Attributes |= FILE_ATTRIBUTE_DIRECTORY; - if (File->File.Attributes & CAB_ATTRIB_ARCHIVE) + if (File->Attributes & CAB_ATTRIB_ARCHIVE) Attributes |= FILE_ATTRIBUTE_ARCHIVE; NtStatus = NtQueryInformationFile(hFile, @@ -435,698 +356,7 @@ return NT_SUCCESS(NtStatus); } - static ULONG -ReadBlock(PVOID Buffer, - ULONG Size, - PULONG BytesRead) -/* - * FUNCTION: Read a block of data from file - * ARGUMENTS: - * Buffer = Pointer to data buffer - * Size = Length of data buffer - * BytesRead = Pointer to ULONG that on return will contain - * number of bytes read - * RETURNS: - * Status of operation - */ -{ - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS NtStatus; - - NtStatus = NtReadFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - Buffer, - Size, - NULL, - NULL); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("ReadBlock for %d bytes failed (%x)\n", Size, NtStatus); - *BytesRead = 0; - return CAB_STATUS_INVALID_CAB; - } - *BytesRead = Size; - return CAB_STATUS_SUCCESS; -} - - -static PCFFOLDER_NODE -NewFolderNode() -/* - * FUNCTION: Creates a new folder node - * RETURNS: - * Pointer to node if there was enough free memory available, otherwise NULL - */ -{ - PCFFOLDER_NODE Node; - - Node = (PCFFOLDER_NODE)RtlAllocateHeap (ProcessHeap, 0, sizeof(CFFOLDER_NODE)); - if (!Node) - return NULL; - - RtlZeroMemory(Node, sizeof(CFFOLDER_NODE)); - - Node->Folder.CompressionType = CAB_COMP_NONE; - - Node->Prev = FolderListTail; - - if (FolderListTail != NULL) - { - FolderListTail->Next = Node; - } - else - { - FolderListHead = Node; - } - FolderListTail = Node; - - return Node; -} - - -static PCFFILE_NODE -NewFileNode() -/* - * FUNCTION: Creates a new file node - * ARGUMENTS: - * FolderNode = Pointer to folder node to bind file to - * RETURNS: - * Pointer to node if there was enough free memory available, otherwise NULL - */ -{ - PCFFILE_NODE Node; - - Node = (PCFFILE_NODE)RtlAllocateHeap (ProcessHeap, 0, sizeof(CFFILE_NODE)); - if (!Node) - return NULL; - - RtlZeroMemory(Node, sizeof(CFFILE_NODE)); - - Node->Prev = FileListTail; - - if (FileListTail != NULL) - { - FileListTail->Next = Node; - } - else - { - FileListHead = Node; - } - FileListTail = Node; - - return Node; -} - - -static PCFDATA_NODE -NewDataNode(PCFFOLDER_NODE FolderNode) -/* - * FUNCTION: Creates a new data block node - * ARGUMENTS: - * FolderNode = Pointer to folder node to bind data block to - * RETURNS: - * Pointer to node if there was enough free memory available, otherwise NULL - */ -{ - PCFDATA_NODE Node; - - Node = (PCFDATA_NODE)RtlAllocateHeap (ProcessHeap, 0, sizeof(CFDATA_NODE)); - if (!Node) - return NULL; - - RtlZeroMemory(Node, sizeof(CFDATA_NODE)); - - Node->Prev = FolderNode->DataListTail; - - if (FolderNode->DataListTail != NULL) - { - FolderNode->DataListTail->Next = Node; - } - else - { - FolderNode->DataListHead = Node; - } - FolderNode->DataListTail = Node; - - return Node; -} - - -static VOID -DestroyDataNodes(PCFFOLDER_NODE FolderNode) -/* - * FUNCTION: Destroys data block nodes bound to a folder node - * ARGUMENTS: - * FolderNode = Pointer to folder node - */ -{ - PCFDATA_NODE PrevNode; - PCFDATA_NODE NextNode; - - NextNode = FolderNode->DataListHead; - while (NextNode != NULL) - { - PrevNode = NextNode->Next; - RtlFreeHeap(ProcessHeap, 0, NextNode); - NextNode = PrevNode; - } - FolderNode->DataListHead = NULL; - FolderNode->DataListTail = NULL; -} - - -static VOID -DestroyFileNodes() -/* - * FUNCTION: Destroys file nodes - * ARGUMENTS: - * FolderNode = Pointer to folder node - */ -{ - PCFFILE_NODE PrevNode; - PCFFILE_NODE NextNode; - - NextNode = FileListHead; - while (NextNode != NULL) - { - PrevNode = NextNode->Next; - if (NextNode->FileName) - RtlFreeHeap(ProcessHeap, 0, NextNode->FileName); - RtlFreeHeap(ProcessHeap, 0, NextNode); - NextNode = PrevNode; - } - FileListHead = NULL; - FileListTail = NULL; -} - - -#if 0 -static VOID -DestroyDeletedFileNodes() -/* - * FUNCTION: Destroys file nodes that are marked for deletion - */ -{ - PCFFILE_NODE CurNode; - PCFFILE_NODE NextNode; - - CurNode = FileListHead; - while (CurNode != NULL) - { - NextNode = CurNode->Next; - - if (CurNode->Delete) - { - if (CurNode->Prev != NULL) - { - CurNode->Prev->Next = CurNode->Next; - } - else - { - FileListHead = CurNode->Next; - if (FileListHead) - FileListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - { - CurNode->Next->Prev = CurNode->Prev; - } - else - { - FileListTail = CurNode->Prev; - if (FileListTail) - FileListTail->Next = NULL; - } - - DPRINT("Deleting file: '%S'\n", CurNode->FileName); - - if (CurNode->FileName) - RtlFreeHeap(ProcessHeap, 0, CurNode->FileName); - RtlFreeHeap(ProcessHeap, 0, CurNode); - } - CurNode = NextNode; - } -} -#endif - -static VOID -DestroyFolderNodes() -/* - * FUNCTION: Destroys folder nodes - */ -{ - PCFFOLDER_NODE PrevNode; - PCFFOLDER_NODE NextNode; - - NextNode = FolderListHead; - while (NextNode != NULL) - { - PrevNode = NextNode->Next; - DestroyDataNodes(NextNode); - RtlFreeHeap(ProcessHeap, 0, NextNode); - NextNode = PrevNode; - } - FolderListHead = NULL; - FolderListTail = NULL; -} - -#if 0 -static VOID -DestroyDeletedFolderNodes() -/* - * FUNCTION: Destroys folder nodes that are marked for deletion - */ -{ - PCFFOLDER_NODE CurNode; - PCFFOLDER_NODE NextNode; - - CurNode = FolderListHead; - while (CurNode != NULL) - { - NextNode = CurNode->Next; - - if (CurNode->Delete) - { - if (CurNode->Prev != NULL) - { - CurNode->Prev->Next = CurNode->Next; - } - else - { - FolderListHead = CurNode->Next; - if (FolderListHead) - FolderListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - { - CurNode->Next->Prev = CurNode->Prev; - } - else - { - FolderListTail = CurNode->Prev; - if (FolderListTail) - FolderListTail->Next = NULL; - } - - DestroyDataNodes(CurNode); - RtlFreeHeap(ProcessHeap, 0, CurNode); - } - CurNode = NextNode; - } -} -#endif - -static PCFFOLDER_NODE -LocateFolderNode(ULONG Index) -/* - * FUNCTION: Locates a folder node - * ARGUMENTS: - * Index = Folder index - * RETURNS: - * Pointer to folder node or NULL if the folder node was not found - */ -{ - PCFFOLDER_NODE Node; - - switch (Index) - { - case CAB_FILE_SPLIT: - return FolderListTail; - - case CAB_FILE_CONTINUED: - case CAB_FILE_PREV_NEXT: - return FolderListHead; - } - - Node = FolderListHead; - while (Node != NULL) - { - if (Node->Index == Index) - return Node; - Node = Node->Next; - } - return NULL; -} - - -static ULONG -GetAbsoluteOffset(PCFFILE_NODE File) -/* - * FUNCTION: Returns the absolute offset of a file - * ARGUMENTS: - * File = Pointer to CFFILE_NODE structure for file - * RETURNS: - * Status of operation - */ -{ - PCFDATA_NODE Node; - - DPRINT("FileName '%S' FileOffset (0x%X) FileSize (%d).\n", - (PWCHAR)File->FileName, - (UINT)File->File.FileOffset, - (UINT)File->File.FileSize); - - Node = CurrentFolderNode->DataListHead; - while (Node != NULL) - { - DPRINT("GetAbsoluteOffset(): Comparing (0x%X, 0x%X) (%d).\n", - (UINT)Node->UncompOffset, - (UINT)Node->UncompOffset + Node->Data.UncompSize, - (UINT)Node->Data.UncompSize); - - /* Node->Data.UncompSize will be 0 if the block is split - (ie. it is the last block in this cabinet) */ - if ((Node->Data.UncompSize == 0) || - ((File->File.FileOffset >= Node->UncompOffset) && - (File->File.FileOffset < Node->UncompOffset + - Node->Data.UncompSize))) - { - File->DataBlock = Node; - return CAB_STATUS_SUCCESS; - } - - Node = Node->Next; - } - return CAB_STATUS_INVALID_CAB; -} - - -static ULONG -LocateFile(PWCHAR FileName, - PCFFILE_NODE *File) -/* - * FUNCTION: Locates a file in the cabinet - * ARGUMENTS: - * FileName = Pointer to string with name of file to locate - * File = Address of pointer to CFFILE_NODE structure to fill - * RETURNS: - * Status of operation - * NOTES: - * Current folder is set to the folder of the file - */ -{ - PCFFILE_NODE Node; - ULONG Status; - - DPRINT("FileName '%S'\n", FileName); - - Node = FileListHead; - while (Node != NULL) - { - if (_wcsicmp(FileName, Node->FileName) == 0) - { - CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); - if (!CurrentFolderNode) - { - DPRINT("Folder with index number (%d) not found.\n", - (UINT)Node->File.FileControlID); - return CAB_STATUS_INVALID_CAB; - } - - if (Node->DataBlock == NULL) - { - Status = GetAbsoluteOffset(Node); - } - else - Status = CAB_STATUS_SUCCESS; - *File = Node; - return Status; - } - Node = Node->Next; - } - return CAB_STATUS_NOFILE; -} - - -static ULONG -ReadString(PWCHAR String, ULONG MaxLength) -/* - * FUNCTION: Reads a NULL-terminated string from the cabinet - * ARGUMENTS: - * String = Pointer to buffer to place string - * MaxLength = Maximum length of string - * RETURNS: - * Status of operation - */ -{ - NTSTATUS NtStatus; - ULONG BytesRead; - ULONG Offset; - ULONG Status; - ULONG Size; - BOOL Found; - CHAR buf[MAX_PATH]; - ANSI_STRING as; - UNICODE_STRING us; - - Offset = 0; - Found = FALSE; - do - { - Size = ((Offset + 32) <= MaxLength)? 32 : MaxLength - Offset; - - if (Size == 0) - { - DPRINT("Too long a filename.\n"); - return CAB_STATUS_INVALID_CAB; - } - - Status = ReadBlock((PCFDATA)&buf[Offset], Size, &BytesRead); - if ((Status != CAB_STATUS_SUCCESS) || (BytesRead != Size)) - { - DPRINT("Cannot read from file (%d).\n", (UINT)Status); - return CAB_STATUS_INVALID_CAB; - } - - for (Size = Offset; Size < Offset + BytesRead; Size++) - { - if (buf[Size] == '\0') - { - Found = TRUE; - break; - } - } - - Offset += BytesRead; - } while (!Found); - - /* Back up some bytes */ - Size = (BytesRead - Size) - 1; - SeekInFile(FileHandle, -(LONG)Size, NULL, SEEK_CURRENT, &NtStatus); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("SeekInFile() failed (%x).\n", NtStatus); - return CAB_STATUS_INVALID_CAB; - } - - RtlInitAnsiString(&as, buf); - us.Buffer = String; - us.MaximumLength = MaxLength * sizeof(WCHAR); - us.Length = 0; - - RtlAnsiStringToUnicodeString(&us, &as, FALSE); - - return CAB_STATUS_SUCCESS; -} - - -static ULONG -ReadFileTable(VOID) -/* - * FUNCTION: Reads the file table from the cabinet file - * RETURNS: - * Status of operation - */ -{ - ULONG i; - ULONG Status; - ULONG BytesRead; - PCFFILE_NODE File; - NTSTATUS NtStatus; - - DPRINT("Reading file table at absolute offset (0x%X).\n", - CABHeader.FileTableOffset); - - /* Seek to file table */ - SeekInFile(FileHandle, CABHeader.FileTableOffset, NULL, SEEK_BEGIN, &NtStatus); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("SeekInFile() failed (%x).\n", NtStatus); - return CAB_STATUS_INVALID_CAB; - } - - for (i = 0; i < CABHeader.FileCount; i++) - { - File = NewFileNode(); - if (!File) - { - DPRINT("Insufficient memory.\n"); - return CAB_STATUS_NOMEMORY; - } - - if ((Status = ReadBlock(&File->File, sizeof(CFFILE), - &BytesRead)) != CAB_STATUS_SUCCESS) { - DPRINT("Cannot read from file (%d).\n", (UINT)Status); - return CAB_STATUS_INVALID_CAB; - } - - File->FileName = (PWCHAR)RtlAllocateHeap(ProcessHeap, 0, MAX_PATH * sizeof(WCHAR)); - if (!File->FileName) - { - DPRINT("Insufficient memory.\n"); - return CAB_STATUS_NOMEMORY; - } - - /* Read file name */ - Status = ReadString(File->FileName, MAX_PATH); - if (Status != CAB_STATUS_SUCCESS) - return Status; - - DPRINT("Found file '%S' at uncompressed offset (0x%X). Size (%d bytes) ControlId (0x%X).\n", - (PWCHAR)File->FileName, - (UINT)File->File.FileOffset, - (UINT)File->File.FileSize, - (UINT)File->File.FileControlID); - } - return CAB_STATUS_SUCCESS; -} - - -static ULONG -ReadDataBlocks(PCFFOLDER_NODE FolderNode) -/* - * FUNCTION: Reads all CFDATA blocks for a folder from the cabinet file - * ARGUMENTS: - * FolderNode = Pointer to CFFOLDER_NODE structure for folder - * RETURNS: - * Status of operation - */ -{ - ULONG AbsoluteOffset; - ULONG UncompOffset; - PCFDATA_NODE Node; - NTSTATUS NtStatus; - ULONG BytesRead; - ULONG Status; - ULONG i; - - DPRINT("Reading data blocks for folder (%d) at absolute offset (0x%X).\n", - FolderNode->Index, FolderNode->Folder.DataOffset); - - AbsoluteOffset = FolderNode->Folder.DataOffset; - UncompOffset = FolderNode->UncompOffset; - - for (i = 0; i < FolderNode->Folder.DataBlockCount; i++) - { - Node = NewDataNode(FolderNode); - if (!Node) - { - DPRINT("Insufficient memory.\n"); - return CAB_STATUS_NOMEMORY; - } - - /* Seek to data block */ - SeekInFile(FileHandle, AbsoluteOffset, NULL, SEEK_BEGIN, &NtStatus); [truncated at 1000 lines; 1631 more skipped]

19 years, 4 months

[hpoussin] 15402: Basic resources device allocation (doesn't prevent conflicts)

by hpoussin＠svn.reactos.com

Basic resources device allocation (doesn't prevent conflicts) Send allocated resources in IRP_MN_START_DEVICE Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-05-18 21:48:41 UTC (rev 15401) +++ trunk/reactos/ntoskrnl/io/device.c 2005-05-18 22:05:11 UTC (rev 15402) @@ -135,7 +135,6 @@ IopStartDevice( PDEVICE_NODE DeviceNode) { - IO_STATUS_BLOCK IoStatusBlock; IO_STACK_LOCATION Stack; PDEVICE_OBJECT Fdo; @@ -144,10 +143,8 @@ DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - /* FIXME: Should be DeviceNode->ResourceList */ - Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->BootResources; - /* FIXME: Should be DeviceNode->ResourceListTranslated */ - Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->BootResources; + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; Status = IopInitiatePnpIrp( Fdo, _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-18 21:48:41 UTC (rev 15401) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-18 22:05:11 UTC (rev 15402) @@ -242,6 +242,7 @@ Length = 0; Data = NULL; } + break; case DevicePropertyPhysicalDeviceObjectName: return STATUS_NOT_IMPLEMENTED; @@ -894,6 +895,160 @@ } +NTSTATUS +IopAssignDeviceResources( + PDEVICE_NODE DeviceNode) +{ + PIO_RESOURCE_LIST ResourceList; + PIO_RESOURCE_DESCRIPTOR ResourceDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR DescriptorRaw, DescriptorTranslated; + ULONG NumberOfResources = 0; + ULONG i; + + /* Fill DeviceNode->ResourceList and DeviceNode->ResourceListTranslated; + * by using DeviceNode->ResourceRequirements */ + + if (!DeviceNode->ResourceRequirements + || DeviceNode->ResourceRequirements->AlternativeLists == 0) + { + DeviceNode->ResourceList = DeviceNode->ResourceListTranslated = NULL; + return STATUS_SUCCESS; + } + + /* FIXME: that's here that PnP arbiter should go */ + /* Actually, simply use resource list #0 as assigned resource list */ + ResourceList = &DeviceNode->ResourceRequirements->List[0]; + if (ResourceList->Version != 1 || ResourceList->Revision != 1) + return STATUS_REVISION_MISMATCH; + + DeviceNode->ResourceList = ExAllocatePool(PagedPool, + sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + if (!DeviceNode->ResourceList) + return STATUS_INSUFFICIENT_RESOURCES; + + DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, + sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + if (!DeviceNode->ResourceListTranslated) + { + ExFreePool(DeviceNode->ResourceList); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DeviceNode->ResourceList->Count = 1; + DeviceNode->ResourceList->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType; + DeviceNode->ResourceList->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber; + DeviceNode->ResourceList->List[0].PartialResourceList.Version = 1; + DeviceNode->ResourceList->List[0].PartialResourceList.Revision = 1; + + DeviceNode->ResourceListTranslated->Count = 1; + DeviceNode->ResourceListTranslated->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType; + DeviceNode->ResourceListTranslated->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber; + DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Version = 1; + DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Revision = 1; + + for (i = 0; i < ResourceList->Count; i++) + { + ResourceDescriptor = &ResourceList->Descriptors[i]; + + if (ResourceDescriptor->Option == 0 || ResourceDescriptor->Option == IO_RESOURCE_PREFERRED) + { + DescriptorRaw = &DeviceNode->ResourceList->List[0].PartialResourceList.PartialDescriptor s[NumberOfResources]; + DescriptorTranslated = &DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Partial Descriptors[NumberOfResources]; + NumberOfResources++; + + /* Copy ResourceDescriptor to DescriptorRaw and DescriptorTranslated */ + DescriptorRaw->Type = DescriptorTranslated->Type = ResourceDescriptor->Type; + DescriptorRaw->ShareDisposition = DescriptorTranslated->ShareDisposition = ResourceDescriptor->ShareDisposition; + DescriptorRaw->Flags = DescriptorTranslated->Flags = ResourceDescriptor->Flags; + switch (ResourceDescriptor->Type) + { + case CmResourceTypePort: + { + DescriptorRaw->u.Port.Start = ResourceDescriptor->u.Port.MinimumAddress; + DescriptorRaw->u.Port.Length = DescriptorTranslated->u.Port.Length + = ResourceDescriptor->u.Port.Length; + /*FIXME: DescriptorTranslated->u.Port.Start? */ + break; + } + case CmResourceTypeInterrupt: + { + DescriptorRaw->u.Interrupt.Vector = 0; + /* FIXME: if IRQ 9 is in the possible range, use it. + * This should be a PCI device */ + if (ResourceDescriptor->u.Interrupt.MinimumVector <= 9 + && ResourceDescriptor->u.Interrupt.MaximumVector >= 9) + DescriptorRaw->u.Interrupt.Level = 9; + else + DescriptorRaw->u.Interrupt.Level = ResourceDescriptor->u.Interrupt.MinimumVector; + + DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( + DeviceNode->ResourceRequirements->InterfaceType, + DeviceNode->ResourceRequirements->BusNumber, + DescriptorRaw->u.Interrupt.Level, + DescriptorRaw->u.Interrupt.Vector, + (PKIRQL)&DescriptorTranslated->u.Interrupt.Level, + &DescriptorRaw->u.Interrupt.Affinity); + DescriptorTranslated->u.Interrupt.Affinity = DescriptorRaw->u.Interrupt.Affinity; + break; + } + case CmResourceTypeMemory: + { + DescriptorRaw->u.Memory.Start = ResourceDescriptor->u.Memory.MinimumAddress; + DescriptorRaw->u.Memory.Length = DescriptorTranslated->u.Memory.Length + = ResourceDescriptor->u.Port.Length; + /*FIXME: DescriptorTranslated->u.Memory.Start? */ + break; + } + case CmResourceTypeDma: + { + DPRINT1("IopAssignDeviceResources(): CmResourceTypeDma case not implemented\n"); + DescriptorRaw->u.Dma.Channel = DescriptorTranslated->u.Dma.Channel + = ResourceDescriptor->u.Dma.MinimumChannel; + DescriptorRaw->u.Dma.Port = DescriptorTranslated->u.Dma.Port + = 0; /* FIXME */ + DescriptorRaw->u.Dma.Reserved1 = DescriptorTranslated->u.Dma.Reserved1 + = 0; + break; + } + /*case CmResourceTypeBusNumber: + { + DescriptorRaw->u.BusNumber.Start = DescriptorTranslated->u.BusNumber.Start + = ResourceDescriptor->u.BusNumber.MinBusNumber; + DescriptorRaw->u.BusNumber.Length = DescriptorTranslated->u.BusNumber.Length + = ResourceDescriptor->u.BusNumber.Length; + DescriptorRaw->u.BusNumber.Reserved = DescriptorTranslated->u.BusNumber.Reserved + = ResourceDescriptor->u.BusNumber.Reserved; + break; + }*/ + /*CmResourceTypeDevicePrivate: + case CmResourceTypePcCardConfig: + case CmResourceTypeMfCardConfig: + { + RtlCopyMemory( + &DescriptorRaw->u.DevicePrivate, + &ResourceDescriptor->u.DevicePrivate, + sizeof(ResourceDescriptor->u.DevicePrivate)); + RtlCopyMemory( + &DescriptorTranslated->u.DevicePrivate, + &ResourceDescriptor->u.DevicePrivate, + sizeof(ResourceDescriptor->u.DevicePrivate)); + break; + }*/ + default: + DPRINT1("IopAssignDeviceResources(): unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); + NumberOfResources--; + } + } + + } + + DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources; + DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Count = NumberOfResources; + + return STATUS_SUCCESS; +} + + /* * IopActionInterrogateDeviceStack * @@ -1317,6 +1472,12 @@ ZwClose(InstanceKey); + Status = IopAssignDeviceResources(DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopAssignDeviceResources() failed (Status %x)\n", Status); + } + DeviceNode->Flags |= DNF_PROCESSED; /* Report the device to the user-mode pnp manager */

19 years, 4 months

[hpoussin] 15401: Use translated resources list to get informations about interrupt

by hpoussin＠svn.reactos.com

Use translated resources list to get informations about interrupt Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-05-18 21:28:12 UTC (rev 15400) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-05-18 21:48:41 UTC (rev 15401) @@ -83,12 +83,13 @@ { ULONG ResourceListSize; PCM_RESOURCE_LIST ResourceList; + PCM_RESOURCE_LIST ResourceListTranslated; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptorTranslated; BOOLEAN ConflictDetected; UART_TYPE UartType; PDEVICE_OBJECT Pdo = NULL; PDEVICE_OBJECT Fdo; - KIRQL Dirql; NTSTATUS Status; /* Create resource list */ @@ -96,29 +97,60 @@ ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; + ResourceListTranslated = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); + if (!ResourceListTranslated) + { + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Resource header */ + ResourceList->Count = ResourceListTranslated->Count + = 1; + ResourceList->List[0].InterfaceType = ResourceListTranslated->List[0].InterfaceType + = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = ResourceListTranslated->List[0].BusNumber + = -1; /* unknown */ + ResourceList->List[0].PartialResourceList.Version = ResourceListTranslated->List[0].PartialResourceList.Version + = 1; + ResourceList->List[0].PartialResourceList.Revision = ResourceListTranslated->List[0].PartialResourceList.Revision + = 1; + ResourceList->List[0].PartialResourceList.Count = ResourceListTranslated->List[0].PartialResourceList.Count + = 2; + + /* I/O port */ ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; - ResourceDescriptor->u.Port.Length = 8; + ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 0]; + ResourceDescriptor->Type = ResourceDescriptorTranslated->Type + = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition + = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags + = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = ResourceDescriptorTranslated->u.Port.Start.u.HighPart + = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ResourceDescriptorTranslated->u.Port.Start.u.LowPart + = ComPortBase; + ResourceDescriptor->u.Port.Length = ResourceDescriptorTranslated->u.Port.Length + = 8; ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptor->Type = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, 0, Irq, - &Dirql, + ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 1]; + ResourceDescriptor->Type = ResourceDescriptorTranslated->Type + = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition + = CmResourceShareShared; + ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags + = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Level = Irq; + ResourceDescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( + ResourceList->List[0].InterfaceType, + ResourceList->List[0].BusNumber, + ResourceDescriptor->u.Interrupt.Level, + ResourceDescriptor->u.Interrupt.Vector, + (PKIRQL)&ResourceDescriptorTranslated->u.Interrupt.Level, &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + ResourceDescriptorTranslated->u.Interrupt.Affinity = ResourceDescriptor->u.Interrupt.Affinity; /* Report resource list */ Status = IoReportResourceForDetection( @@ -129,11 +161,13 @@ { DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return STATUS_DEVICE_NOT_CONNECTED; } if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return Status; } @@ -154,7 +188,7 @@ Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); if (NT_SUCCESS(Status)) { - Status = SerialPnpStartDevice(Fdo, ResourceList); + Status = SerialPnpStartDevice(Fdo, ResourceList, ResourceListTranslated); } } } @@ -168,6 +202,7 @@ Status = STATUS_DEVICE_NOT_CONNECTED; } ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return Status; } _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-05-18 21:28:12 UTC (rev 15400) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-05-18 21:48:41 UTC (rev 15401) @@ -126,7 +126,8 @@ NTSTATUS STDCALL SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PCM_RESOURCE_LIST ResourceList) + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated) { PSERIAL_DEVICE_EXTENSION DeviceExtension; WCHAR DeviceNameBuffer[32]; @@ -174,8 +175,8 @@ case CmResourceTypeInterrupt: if (Dirql != 0) return STATUS_UNSUCCESSFUL; - Dirql = (KIRQL)PartialDescriptor->u.Interrupt.Level; - Vector = PartialDescriptor->u.Interrupt.Vector; + Dirql = (KIRQL)ResourceListTranslated->List[i].PartialResourceList.PartialDescri ptors[j].u.Interrupt.Level; + Vector = ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j ].u.Interrupt.Vector; Affinity = PartialDescriptor->u.Interrupt.Affinity; if (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) InterruptMode = Latched; @@ -338,16 +339,9 @@ BOOLEAN ConflictDetected; DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - /* FIXME: first HACK: PnP manager can send multiple - * IRP_MN_START_DEVICE for one device - */ - if (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState != dsStopped) - { - DPRINT1("Serial: device already started. Ignoring this irp!\n"); - Status = STATUS_SUCCESS; - break; - } - /* FIXME: second HACK: verify that we have some allocated resources. + ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpSta te == dsStopped); + + /* FIXME: HACK: verify that we have some allocated resources. * It seems not to be always the case on some hardware */ if (Stack->Parameters.StartDevice.AllocatedResources == NULL) @@ -357,7 +351,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; break; } - /* FIXME: third HACK: verify that we don't have resource conflict, + /* FIXME: HACK: verify that we don't have resource conflict, * because PnP manager doesn't do it automatically */ Status = IoReportResourceForDetection( @@ -377,7 +371,8 @@ if (NT_SUCCESS(Status)) Status = SerialPnpStartDevice( DeviceObject, - Stack->Parameters.StartDevice.AllocatedResources); + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-05-18 21:28:12 UTC (rev 15400) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-05-18 21:48:41 UTC (rev 15401) @@ -327,7 +327,8 @@ NTSTATUS STDCALL SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PCM_RESOURCE_LIST ResourceList); + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated); NTSTATUS STDCALL SerialPnp(

19 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005