Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[navaraf] 13856: - Fix pipe connection to non-waiting pipes.

by navaraf＠svn.reactos.com

- Fix pipe connection to non-waiting pipes. - More corrections to the cancellation logic. - Minor correction to read/write event setting (still I'm getting infinite loops there in some cases). Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/rw.c Modified: trunk/reactos/drivers/fs/np/volume.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-03-06 14:03:37 UTC (rev 13855) +++ trunk/reactos/drivers/fs/np/create.c 2005-03-06 16:42:36 UTC (rev 13856) @@ -148,39 +148,13 @@ KeUnlockMutex(&DeviceExt->PipeListLock); /* - * Step 2. Search for listening server FCB. - */ - - /* * Acquire the lock for FCB lists. From now on no modifications to the * FCB lists are allowed, because it can cause various misconsistencies. */ KeLockMutex(&Pipe->FcbListLock); - if (!SpecialAccess) - { - ServerFcb = NpfsFindListeningServerInstance(Pipe); - if (ServerFcb == NULL) - { - /* Not found, bail out with error for FILE_OPEN requests. */ - DPRINT("No listening server fcb found!\n"); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_PIPE_BUSY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_PIPE_BUSY; - } - } - else if (IsListEmpty(&Pipe->ServerFcbListHead)) - { - DPRINT("No server fcb found!\n"); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } - /* - * Step 3. Create the client FCB. + * Step 2. Create the client FCB. */ ClientFcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); if (ClientFcb == NULL) @@ -227,6 +201,73 @@ KeInitializeEvent(&ClientFcb->Event, SynchronizationEvent, FALSE); /* + * Step 3. Search for listening server FCB. + */ + + if (!SpecialAccess) + { + /* + * WARNING: Point of no return! Once we get the server FCB it's + * possible that we completed a wait request and so we have to + * complete even this request. + */ + + ServerFcb = NpfsFindListeningServerInstance(Pipe); + if (ServerFcb == NULL) + { + PLIST_ENTRY CurrentEntry; + PNPFS_FCB Fcb; + + /* + * If no waiting server FCB was found then try to pick + * one of the listing server FCB on the pipe. + */ + + CurrentEntry = Pipe->ServerFcbListHead.Flink; + while (CurrentEntry != &Pipe->ServerFcbListHead) + { + Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + { + ServerFcb = Fcb; + break; + } + CurrentEntry = CurrentEntry->Flink; + } + + /* + * No one is listening to me?! I'm so lonely... :( + */ + + if (ServerFcb == NULL) + { + /* Not found, bail out with error for FILE_OPEN requests. */ + DPRINT("No listening server fcb found!\n"); + if (ClientFcb->Data) + ExFreePool(ClientFcb->Data); + KeUnlockMutex(&Pipe->FcbListLock); + Irp->IoStatus.Status = STATUS_PIPE_BUSY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_PIPE_BUSY; + } + } + else + { + /* Signal the server thread and remove it from the waiter list */ + /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ + NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); + } + } + else if (IsListEmpty(&Pipe->ServerFcbListHead)) + { + DPRINT("No server fcb found!\n"); + KeUnlockMutex(&Pipe->FcbListLock); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + } + + /* * Step 4. Add the client FCB to a list and connect it if possible. */ @@ -240,9 +281,6 @@ ServerFcb->OtherSide = ClientFcb; ClientFcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerFcb->PipeState = FILE_PIPE_CONNECTED_STATE; - - /* Signal the server thread and remove it from the waiter list */ - NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); } KeUnlockMutex(&Pipe->FcbListLock); _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-06 14:03:37 UTC (rev 13855) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-06 16:42:36 UTC (rev 13856) @@ -26,19 +26,12 @@ DPRINT1("NpfsListeningCancelRoutine() called\n"); - /* FIXME: Not tested. */ - IoReleaseCancelSpinLock(Irp->CancelIrql); Waiter = Irp->Tail.Overlay.DriverContext[0]; KeLockMutex(&Waiter->Pipe->FcbListLock); RemoveEntryList(&Waiter->Entry); - if (IoSetCancelRoutine(Waiter->Irp, NULL) == NULL) - { - KeUnlockMutex(&Waiter->Pipe->FcbListLock); - return; - } KeUnlockMutex(&Waiter->Pipe->FcbListLock); Irp->IoStatus.Status = STATUS_CANCELLED; @@ -53,7 +46,6 @@ PNPFS_FCB Fcb) { PNPFS_WAITER_ENTRY Entry; - KIRQL OldIrql; Entry = ExAllocatePool(NonPagedPool, sizeof(NPFS_WAITER_ENTRY)); if (Entry == NULL) @@ -63,21 +55,26 @@ Entry->Fcb = Fcb; Entry->Pipe = Fcb->Pipe; - IoAcquireCancelSpinLock(&OldIrql); + KeLockMutex(&Fcb->Pipe->FcbListLock); + + IoMarkIrpPending(Irp); + Irp->Tail.Overlay.DriverContext[0] = Entry; + InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); + + IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); + if (!Irp->Cancel) { - Irp->Tail.Overlay.DriverContext[0] = Entry; - IoMarkIrpPending(Irp); - IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); - KeLockMutex(&Fcb->Pipe->FcbListLock); - InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); KeUnlockMutex(&Fcb->Pipe->FcbListLock); - IoReleaseCancelSpinLock(OldIrql); return STATUS_PENDING; } - /* IRP has already been cancelled */ - IoReleaseCancelSpinLock(OldIrql); - + + RemoveEntryList(&Entry->Entry); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + KeUnlockMutex(&Fcb->Pipe->FcbListLock); ExFreePool(Entry); return STATUS_CANCELLED; _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-03-06 14:03:37 UTC (rev 13855) +++ trunk/reactos/drivers/fs/np/rw.c 2005-03-06 16:42:36 UTC (rev 13856) @@ -165,7 +165,10 @@ if (Length == 0) { - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } KeResetEvent(&Fcb->Event); break; } @@ -197,6 +200,11 @@ } else { + KeResetEvent(&Fcb->Event); + if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + } Fcb->ReadDataAvailable = 0; Fcb->WriteQuotaAvailable = Fcb->MaxDataLength; } @@ -204,11 +212,6 @@ if (Information > 0) { - if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); - } - KeResetEvent(&Fcb->Event); break; } } @@ -383,12 +386,12 @@ ReaderFcb->WriteQuotaAvailable = 0; } - if (Information > 0) - { - KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); - KeResetEvent(&Fcb->Event); - break; - } + if (Information > 0) + { + KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); + KeResetEvent(&Fcb->Event); + break; + } } } _____ Modified: trunk/reactos/drivers/fs/np/volume.c --- trunk/reactos/drivers/fs/np/volume.c 2005-03-06 14:03:37 UTC (rev 13855) +++ trunk/reactos/drivers/fs/np/volume.c 2005-03-06 16:42:36 UTC (rev 13856) @@ -36,7 +36,7 @@ DPRINT("NpfsQueryFsDeviceInformation() finished.\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; }

19 years, 8 months

[gdalsnes] 13855: add missing newline

by gdalsnes＠svn.reactos.com

add missing newline Modified: trunk/reactos/doc/irp cancel boilerplate.c _____ Modified: trunk/reactos/doc/irp cancel boilerplate.c --- trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 13:49:10 UTC (rev 13854) +++ trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 14:03:37 UTC (rev 13855) @@ -95,8 +95,3 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); } - - - - - \ No newline at end of file

19 years, 8 months

[chorns] 13854: Don't generate intermediate archives

by chorns＠svn.reactos.com

Don't generate intermediate archives Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml Modified: branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml --- branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -25,11 +25,6 @@ <file>irp.c</file> <file>lock.c</file> <file>main.c</file> - <file>mockbuffer.c</file> - <file>mockbug.c</file> - <file>mocklock.c</file> - <file>mockpool.c</file> - <file>mockwait.c</file> <file>ninfo.c</file> <file>pool.c</file> <file>proto.c</file> Property changes on: branches/xmlbuildsystem/reactos/hal/halx86/generic ___________________________________________________________________ Name: svn:ignore + *.o _____ Modified: branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml --- branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/generic/generic.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -1,31 +1,43 @@ -<module name="hal_generic" type="staticlibrary"> +<module name="hal_generic" type="objectlibrary"> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTHAL__" /> - <file>adapter.c</file> - <file>beep.c</file> - <file>bus.c</file> - <file>display.c</file> - <file>dma.c</file> - <file>drive.c</file> - <file>enum.c</file> - <file>fmutex.c</file> - <file>halinit.c</file> - <file>ipi.c</file> - <file>irql.c</file> - <file>isa.c</file> - <file>kdbg.c</file> - <file>mca.c</file> - <file>misc.c</file> - <file>pci.c</file> - <file>portio.c</file> - <file>processor.c</file> - <file>reboot.c</file> - <file>resource.c</file> - <file>spinlock.c</file> - <file>sysbus.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> + <file>adapter.c</file> + <file>beep.c</file> + <file>bus.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>enum.c</file> + <file>fmutex.c</file> + <file>halinit.c</file> + <file>isa.c</file> + <file>kdbg.c</file> + <file>mca.c</file> + <file>misc.c</file> + <file>pci.c</file> + <file>portio.c</file> + <file>reboot.c</file> + <file>spinlock.c</file> + <file>sysbus.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timer.c</file> </module> +<module name="hal_generic_up" type="objectlibrary"> + <include base="hal_generic_up">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__NTHAL__" /> + <file>ipi.c</file> + <file>irql.c</file> + <file>processor.c</file> + <file>resource.c</file> +</module> +<module name="hal_generic_pc" type="objectlibrary"> + <include base="hal_generic_pc">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__NTHAL__" /> + <file>display.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml --- branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/mp/halmp.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,9 @@ <define name="_DISABLE_TIDENTS" /> <define name="CONFIG_SMP" /> <define name="__NTHAL__" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> <file>apic.c</file> <file>halinit_mp.c</file> <file>ipi_mp.c</file> _____ Modified: branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml --- branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/up/halup.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,10 @@ <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTHAL__" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> <file>halinit_up.c</file> <file>halup.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml --- branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/hal/halx86/xbox/halxbox.xml 2005-03-06 13:49:10 UTC (rev 13854) @@ -4,6 +4,9 @@ <define name="_DISABLE_TIDENTS" /> <define name="UP" /> <define name="__NTHAL__" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> <file>display_xbox.c</file> <file>font.c</file> <file>halinit_xbox.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-06 13:48:04 UTC (rev 13853) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-06 13:49:10 UTC (rev 13854) @@ -481,7 +481,7 @@ { size_t i; - if ( includes.size() || defines.size() ) + if ( includes.size () > 0 || defines.size () > 0 ) { GenerateMacro ( assignmentOperation, cflags_macro, @@ -509,9 +509,9 @@ } } - if ( files.size() ) + if ( files.size () > 0 ) { - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < files.size (); i++ ) { if ( files[i]->first ) { @@ -525,14 +525,11 @@ fprintf ( fMakefile, "%s %s", - objs_macro.c_str(), + objs_macro.c_str (), assignmentOperation ); for ( i = 0; i < files.size(); i++ ) { - string extension = GetExtension ( files[i]->name ); - if ( extension != ".spec" - && extension != ".SPEC" - && !files[i]->first ) + if ( !files[i]->first ) { fprintf ( fMakefile, @@ -1308,7 +1305,7 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module ) { string target ( FixupTargetFilename ( module.GetPath () ) ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateMacrosAndTargetsHost ( module ); @@ -1321,14 +1318,14 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); fprintf ( fMakefile, "\t%s %s -o %s %s %s\n\n", linker.c_str (), GetLinkerMacro ( module ).c_str (), target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); } @@ -1473,7 +1470,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1484,7 +1481,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", @@ -1493,7 +1490,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - archiveFilename ); + objectsMacro ); } else { @@ -1526,8 +1523,8 @@ { static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) ); - string workingDirectory = GetWorkingDirectory ( ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string workingDirectory = GetWorkingDirectory (); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1542,7 +1539,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", @@ -1551,7 +1548,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - archiveFilename ); + objectsMacro ); } else { @@ -1584,8 +1581,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1596,7 +1592,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", @@ -1605,7 +1601,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1638,8 +1634,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); - string archiveFilename = GetModuleArchiveFilename ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1654,7 +1649,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - archiveFilename.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", @@ -1663,7 +1658,7 @@ GenerateLinkerCommand ( module, "${gcc}", linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1718,7 +1713,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string linkingDependencies = GetLinkingDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1728,7 +1723,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), linkingDependencies.c_str () ); string linker; @@ -1743,7 +1738,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1776,7 +1771,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1787,7 +1782,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linker; @@ -1802,7 +1797,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else { @@ -1835,7 +1830,7 @@ static string ros_junk ( "$(ROS_TEMPORARY)" ); string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory ( ); - string objectFilenames = GetObjectFilenames ( module ); + string objectsMacro = GetObjectsMacro ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); @@ -1846,7 +1841,7 @@ fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), - objectFilenames.c_str (), + objectsMacro.c_str (), importLibraryDependencies.c_str () ); string linker; @@ -1861,7 +1856,7 @@ GenerateLinkerCommand ( module, linker, linkerParameters, - objectFilenames ); + objectsMacro ); } else {

19 years, 8 months

[gdalsnes] 13853: IoCancelIrp didnt remove the cancel routine from the irp after canceling it

by gdalsnes＠svn.reactos.com

IoCancelIrp didnt remove the cancel routine from the irp after canceling it Modified: trunk/reactos/ntoskrnl/io/cancel.c _____ Modified: trunk/reactos/ntoskrnl/io/cancel.c --- trunk/reactos/ntoskrnl/io/cancel.c 2005-03-06 13:41:18 UTC (rev 13852) +++ trunk/reactos/ntoskrnl/io/cancel.c 2005-03-06 13:48:04 UTC (rev 13853) @@ -204,18 +204,23 @@ IoCancelIrp(PIRP Irp) { KIRQL oldlvl; + PDRIVER_CANCEL CancelRoutine; DPRINT("IoCancelIrp(Irp %x)\n",Irp); IoAcquireCancelSpinLock(&oldlvl); + Irp->Cancel = TRUE; - if (Irp->CancelRoutine == NULL) + + CancelRoutine = IoSetCancelRoutine(Irp, NULL); + if (CancelRoutine == NULL) { IoReleaseCancelSpinLock(oldlvl); return(FALSE); } + Irp->CancelIrql = oldlvl; - Irp->CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); + CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); return(TRUE); }

19 years, 8 months

[gdalsnes] 13852: irp cancelation boiler plate, for irp queues you manage yourself

by gdalsnes＠svn.reactos.com

irp cancelation boiler plate, for irp queues you manage yourself Added: trunk/reactos/doc/irp cancel boilerplate.c _____ Added: trunk/reactos/doc/irp cancel boilerplate.c --- trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 12:37:31 UTC (rev 13851) +++ trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 13:41:18 UTC (rev 13852) @@ -0,0 +1,102 @@ + + +/* +Boiler plate for irp cancelation, for irp queues you manage yourself +-Gunnar +*/ + + + +CancelRoutine( + DEV_OBJ Dev, + Irp + ) +{ + //don't need this since we have our own sync. protecting irp cancellation + IoReleaseCancelSpinLock(Irp->CancelIrql); + + theLock = Irp->Tail.Overlay.DriverContext[3]; + + Lock(theLock); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + +QUEUE_BOLIERPLATE +{ + Lock(theLock); + + Irp->Tail.Overlay.DriverContext[3] = &theLock; + + IoSetCancelRoutine(Irp, CancelRoutine); + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + // IRP has already been cancelled (before we got to queue it), + // but we got to remove the cancel routine before the canceler could, + // so complete irp ourself + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return FALSE; + } + + //else were ok + + + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + + InsertTailList(Queue); + + Unlock(theLock); + +} + + +DEQUEUE_BOILERPLATE +{ + Lock(theLock); + + Irp = RemoveHeadList(Queue); + + if (!IoSetCancelRoutine(Irp, NULL)) + { + /* + Cancel routine WILL be called after we release the spinlock. It will try to remove + the irp from the list and cancel/complete this irp. Since we allready removed it, + make its ListEntry point to itself. + */ + + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + } + + + /* + Cancel routine will NOT be called, canceled or not. + The Irp might have been canceled (Irp->Cancel flag set) but we don't care, + since we are to complete this Irp now anyways. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + + + + \ No newline at end of file

19 years, 8 months

[navaraf] 13851: Fix some cancellation race conditions.

by navaraf＠svn.reactos.com

Fix some cancellation race conditions. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-03-06 12:36:05 UTC (rev 13850) +++ trunk/reactos/drivers/fs/np/create.c 2005-03-06 12:37:31 UTC (rev 13851) @@ -54,10 +54,15 @@ while (CurrentEntry != &Pipe->WaiterListHead) { Waiter = CONTAINING_RECORD(CurrentEntry, NPFS_WAITER_ENTRY, Entry); - if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + if (Waiter->Fcb->PipeState == FILE_PIPE_LISTENING_STATE && + !Waiter->Irp->Cancel) { DPRINT("Server found! Fcb %p\n", Waiter->Fcb); - return Waiter->Fcb; + + if (IoSetCancelRoutine(Waiter->Irp, NULL) != NULL) + { + return Waiter->Fcb; + } } CurrentEntry = CurrentEntry->Flink; _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-06 12:36:05 UTC (rev 13850) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-03-06 12:37:31 UTC (rev 13851) @@ -25,18 +25,26 @@ PNPFS_WAITER_ENTRY Waiter; DPRINT1("NpfsListeningCancelRoutine() called\n"); + /* FIXME: Not tested. */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + Waiter = Irp->Tail.Overlay.DriverContext[0]; + KeLockMutex(&Waiter->Pipe->FcbListLock); RemoveEntryList(&Waiter->Entry); - ExFreePool(Waiter); + if (IoSetCancelRoutine(Waiter->Irp, NULL) == NULL) + { + KeUnlockMutex(&Waiter->Pipe->FcbListLock); + return; + } + KeUnlockMutex(&Waiter->Pipe->FcbListLock); - IoReleaseCancelSpinLock(Irp->CancelIrql); - Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + ExFreePool(Waiter); } @@ -53,7 +61,7 @@ Entry->Irp = Irp; Entry->Fcb = Fcb; - InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); + Entry->Pipe = Fcb->Pipe; IoAcquireCancelSpinLock(&OldIrql); if (!Irp->Cancel) @@ -61,14 +69,15 @@ Irp->Tail.Overlay.DriverContext[0] = Entry; IoMarkIrpPending(Irp); IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); + KeLockMutex(&Fcb->Pipe->FcbListLock); + InsertTailList(&Fcb->Pipe->WaiterListHead, &Entry->Entry); + KeUnlockMutex(&Fcb->Pipe->FcbListLock); IoReleaseCancelSpinLock(OldIrql); return STATUS_PENDING; } /* IRP has already been cancelled */ IoReleaseCancelSpinLock(OldIrql); - DPRINT1("FIXME: Remove waiter entry!\n"); - RemoveEntryList(&Entry->Entry); ExFreePool(Entry); return STATUS_CANCELLED;

19 years, 8 months

[ekohl] 13850: Support pointers to simple types as input arguments.

by ekohl＠svn.reactos.com

Support pointers to simple types as input arguments. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.h Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-06 10:44:38 UTC (rev 13849) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-06 12:36:05 UTC (rev 13850) @@ -1,4 +1,15 @@ ChangeLog + +2005-03-06 ekohl + + tools/widl/client.c + tools/widl/header.c + tools/widl/header.h + tools/widl/server.c + +Support pointers to simple types as input arguments. + + 2005-02-27 sedwards tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-06 10:44:38 UTC (rev 13849) +++ trunk/reactos/tools/widl/client.c 2005-03-06 12:36:05 UTC (rev 13850) @@ -60,6 +60,7 @@ { func_t *func = iface->funcs; var_t *var; + unsigned int type_offset = 2; print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_client("{\n"); @@ -78,54 +79,38 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - switch(var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_BYTE */\n", RPC_FC_BYTE); - break; - case RPC_FC_CHAR: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_CHAR */\n", RPC_FC_CHAR); - break; - case RPC_FC_WCHAR: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_WCHAR */\n", RPC_FC_WCHAR); - break; - case RPC_FC_USHORT: - case RPC_FC_SHORT: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_USHORT */\n", RPC_FC_SHORT); - break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_LONG */\n", RPC_FC_LONG); - break; - case RPC_FC_HYPER: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_HYPER */\n", RPC_FC_HYPER); - break; - case RPC_FC_IGNORE: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_IGNORE */\n", RPC_FC_IGNORE); - break; - case RPC_FC_SMALL: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); - break; - case RPC_FC_FLOAT: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); - break; - case RPC_FC_DOUBLE: - print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); - break; - default: - error("Unknown/unsupported type\n"); - return; + if (is_base_type(var->type)) + { + print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_<type> */\n", var->type->type); + } + else + { + error("Unknown/unsupported type\n"); + return; + } } + else if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + print_client("0x4d, /* FC_IN_PARAM */\n"); + fprintf(client, "#ifndef _ALPHA_\n"); + print_client("0x01,\n"); + fprintf(client, "#else\n"); + print_client("0x02,\n"); + fprintf(client, "#endif\n"); + print_client("NdrFcShort(0x%x),\n", type_offset); + type_offset += 4; + } + else + { + error("Unknown/unsupported type\n"); + return; + } + } var = PREV_LINK(var); } @@ -138,58 +123,15 @@ print_client("0x5b, /* FC_END */\n"); print_client("0x5c, /* FC_PAD */\n"); } + else if (is_base_type(var->type)) + { + print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_client("0x%02x, /* FC_<type> */\n", var->type->type); + } else { - switch(var->type->type) - { - case RPC_FC_BYTE: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_BYTE */\n", var->type->type); - break; - case RPC_FC_CHAR: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_CHAR */\n", var->type->type); - break; - case RPC_FC_WCHAR: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_WCHAR */\n", var->type->type); - break; - case RPC_FC_USHORT: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_USHORT */\n", var->type->type); - break; - case RPC_FC_SHORT: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_SHORT */\n", var->type->type); - break; - case RPC_FC_ULONG: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_ULONG */\n", var->type->type); - break; - case RPC_FC_LONG: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_LONG */\n", var->type->type); - break; - case RPC_FC_HYPER: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_HYPER */\n", var->type->type); - break; - case RPC_FC_SMALL: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); - break; - case RPC_FC_FLOAT: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); - break; - case RPC_FC_DOUBLE: - print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); - break; - default: - error("Unknown/unsupported type\n"); - return; - } + error("Unknown/unsupported type\n"); + return; } func = PREV_LINK(func); @@ -204,8 +146,11 @@ } -static void write_typeformatstring(void) +static void write_typeformatstring(type_t *iface) { + func_t *func = iface->funcs; + var_t *var; + print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); indent++; @@ -213,6 +158,42 @@ print_client("{\n"); indent++; print_client("NdrFcShort(0x0),\n"); + + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } + + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + print_client("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + print_client("0x%02x, /* FC_<type> */\n", var->type->type); + print_client("0x5c, /* FC_PAD */\n"); + } + } + + var = PREV_LINK(var); + } + } + + + + func = PREV_LINK(func); + } + print_client("0x0\n"); indent--; print_client("}\n"); @@ -227,6 +208,8 @@ unsigned int alignment; int size; int last_size = -1; + int in_attr; + int out_attr; var_t *var; if (!func->args) @@ -237,8 +220,18 @@ var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + + /* set 'in' attribute if neither 'in' nor 'out' is found */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (!in_attr) + continue; + alignment = 0; switch (var->type->type) { @@ -253,7 +246,7 @@ case RPC_FC_USHORT: case RPC_FC_SHORT: size = 2; - if (last_size != -1 && last_size < 2) + if (last_size > 0 && last_size < 2) alignment += (2 - last_size); break; @@ -261,14 +254,14 @@ case RPC_FC_LONG: case RPC_FC_FLOAT: size = 4; - if (last_size != -1 && last_size < 4) + if (last_size > 0 && last_size < 4) alignment += (4 - last_size); break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: size = 8; - if (last_size != -1 && last_size < 4) + if (last_size > 0 && last_size < 4) alignment += (4 - last_size); break; @@ -285,17 +278,17 @@ fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); last_size = size; - - var = PREV_LINK(var); } } -static void marshall_arguments(func_t *func) +static void marshall_in_arguments(func_t *func) { unsigned int alignment; unsigned int size; unsigned int last_size = 0; + int in_attr; + int out_attr; var_t *var; if (!func->args) @@ -303,8 +296,25 @@ var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + + /* set 'in' attribute if neither 'in' nor 'out' is set */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (!in_attr) + continue; + + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } + alignment = 0; switch (var->type->type) { @@ -319,7 +329,7 @@ case RPC_FC_USHORT: case RPC_FC_SHORT: size = 2; - if (last_size != 0 && last_size < 2) + if (last_size > 0 && last_size < 2) alignment = (2 - last_size); break; @@ -327,14 +337,14 @@ case RPC_FC_LONG: case RPC_FC_FLOAT: size = 4; - if (last_size != 0 && last_size < 4) + if (last_size > 0 && last_size < 4) alignment = (4 - last_size); break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: size = 8; - if (last_size != 0 && last_size < 4) + if (last_size > 0 && last_size < 4) alignment = (4 - last_size); break; @@ -352,15 +362,47 @@ print_client("_StubMsg.Buffer += %u;\n", alignment); print_client("*(("); - write_type(client, var->type, var, var->tname); + write_type(client, var->type, NULL, var->tname); fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + if (var->ptr_level == 1) + fprintf(client, "*"); write_name(client, var); fprintf(client, ";\n"); fprintf(client, "\n"); last_size = size; } + } +} + +static void check_pointers(func_t *func) +{ + var_t *var; + + if (!func->args) + return; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 1) + { + print_client("if (!%s)\n", var->name); + print_client("{\n"); + indent++; + print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); + indent--; + print_client("}\n"); + fprintf(client, "\n"); + } + else if (var->ptr_level > 1) + { + error("Pointer level %d not supported!\n", var->ptr_level); + return; + } + var = PREV_LINK(var); } } @@ -426,6 +468,10 @@ print_client("RPC_MESSAGE _RpcMessage;\n"); print_client("MIDL_STUB_MESSAGE _StubMsg;\n"); fprintf(client, "\n"); + + /* check pointers */ + check_pointers(func); + print_client("RpcTryFinally\n"); print_client("{\n"); indent++; @@ -467,8 +513,8 @@ indent--; fprintf(client, "\n"); - /* marshal arguments */ - marshall_arguments(func); + /* marshal in arguments */ + marshall_in_arguments(func); /* send/recieve message */ print_client("NdrSendReceive(\n"); @@ -477,7 +523,7 @@ print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n"); indent--; - /* unmarshal return value */ + /* convert data representation */ if (!is_void(def->type, NULL)) { fprintf(client, "\n"); @@ -503,7 +549,19 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += 2; /* FIXME */ + switch (var->ptr_level) + { + case 0: + if (is_base_type(var->type)) + proc_offset += 2; + break; + + case 1: + if (is_base_type(var->type)) + proc_offset += 4; + break; + } + var = PREV_LINK(var); } } @@ -633,14 +691,47 @@ } -static void write_formatstringsdecl(type_t *iface) +static int get_type_format_string_size(type_t *iface) { - int byte_count = 1; + int size = 3; func_t *func; var_t *var; - print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ + /* determine the proc format string size */ + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + size += 4; + } + var = PREV_LINK(var); + } + } + + func = PREV_LINK(func); + } + + return size; +} + + +static int get_proc_format_string_size(type_t *iface) +{ + int size = 1; + func_t *func; + var_t *var; + /* determine the proc format string size */ func = iface->funcs; while (NEXT_LINK(func)) func = NEXT_LINK(func); @@ -653,18 +744,40 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - byte_count += 2; /* FIXME: determine real size */ + switch (var->ptr_level) + { + case 0: + if (is_base_type(var->type)) + size += 2; + break; + + case 1: + if (is_base_type(var->type)) + size += 4; + break; + } + var = PREV_LINK(var); } } /* return value size */ - byte_count += 2; /* FIXME: determine real size */ + size += 2; func = PREV_LINK(func); } - print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + return size; +} + +static void write_formatstringsdecl(type_t *iface) +{ + print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", + get_type_format_string_size(iface)); + + print_client("#define PROC_FORMAT_STRING_SIZE %d\n", + get_proc_format_string_size(iface)); + fprintf(client, "\n"); write_formatdesc("TYPE"); write_formatdesc("PROC"); @@ -741,7 +854,7 @@ fprintf(client, "\n"); write_procformatstring(iface->iface); - write_typeformatstring(); + write_typeformatstring(iface->iface); fprintf(client, "\n"); _____ Modified: trunk/reactos/tools/widl/header.c --- trunk/reactos/tools/widl/header.c 2005-03-06 10:44:38 UTC (rev 13849) +++ trunk/reactos/tools/widl/header.c 2005-03-06 12:36:05 UTC (rev 13850) @@ -45,6 +45,18 @@ if (delta > 0) indentation += delta; } +int is_base_type(type_t *t) +{ + return (t->type == RPC_FC_BYTE || t->type == RPC_FC_CHAR || + t->type == RPC_FC_SMALL || t->type == RPC_FC_USMALL || + t->type == RPC_FC_WCHAR || t->type == RPC_FC_SHORT || + t->type == RPC_FC_USHORT || t->type == RPC_FC_LONG || + t->type == RPC_FC_ULONG || t->type == RPC_FC_FLOAT || + t->type == RPC_FC_HYPER || t->type == RPC_FC_DOUBLE || + t->type == RPC_FC_ENUM16 || t->type == RPC_FC_ENUM32 || + t->type == RPC_FC_IGNORE); +} + int is_attr(attr_t *a, enum attr_type t) { while (a) { _____ Modified: trunk/reactos/tools/widl/header.h --- trunk/reactos/tools/widl/header.h 2005-03-06 10:44:38 UTC (rev 13849) +++ trunk/reactos/tools/widl/header.h 2005-03-06 12:36:05 UTC (rev 13850) @@ -21,6 +21,7 @@ #ifndef __WIDL_HEADER_H #define __WIDL_HEADER_H +extern int is_base_type(type_t *t); extern int is_attr(attr_t *a, enum attr_type t); extern void *get_attrp(attr_t *a, enum attr_type t); extern unsigned long get_attrv(attr_t *a, enum attr_type t); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-03-06 10:44:38 UTC (rev 13849) +++ trunk/reactos/tools/widl/server.c 2005-03-06 12:36:05 UTC (rev 13850) @@ -65,6 +65,7 @@ { func_t *func = iface->funcs; var_t *var; + unsigned int type_offset = 2; print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_server("{\n"); @@ -83,59 +84,38 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - switch(var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_BYTE */\n", var->type->type); - break; - case RPC_FC_CHAR: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_CHAR */\n", var->type->type); - break; - case RPC_FC_WCHAR: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_WCHAR */\n", var->type->type); - break; - case RPC_FC_USHORT: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_USHORT */\n", var->type->type); - break; - case RPC_FC_SHORT: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_SHORT */\n", var->type->type); - break; - case RPC_FC_ULONG: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_ULONG */\n", var->type->type); - break; - case RPC_FC_LONG: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_LONG */\n", var->type->type); - break; - case RPC_FC_HYPER: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_HYPER */\n", var->type->type); - break; - case RPC_FC_IGNORE: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_IGNORE */\n", var->type->type); - break; - case RPC_FC_SMALL: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); - break; - case RPC_FC_FLOAT: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); - break; - case RPC_FC_DOUBLE: - print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); - break; - default: - error("Unknown/unsupported type\n"); + if (is_base_type(var->type)) + { + print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_<type> */\n", var->type->type); + } + else + { + error("Unknown/unsupported type\n"); + return; + } } + else if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + print_server("0x4d, /* FC_IN_PARAM */\n"); + fprintf(server, "#ifndef _ALPHA_\n"); + print_server("0x01,\n"); + fprintf(server, "#else\n"); + print_server("0x02,\n"); + fprintf(server, "#endif\n"); + print_server("NdrFcShort(0x%x),\n", type_offset); + type_offset += 4; + } + else + { + error("Unknown/unsupported type\n"); + return; + } + } var = PREV_LINK(var); } @@ -148,57 +128,15 @@ print_server("0x5b, /* FC_END */\n"); print_server("0x5c, /* FC_PAD */\n"); } + else if (is_base_type(var->type)) + { + print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + print_server("0x%02x, /* FC_<type> */\n", var->type->type); + } else { - switch(var->type->type) - { - case RPC_FC_BYTE: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_BYTE */\n", var->type->type); - break; - case RPC_FC_CHAR: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_CHAR */\n", var->type->type); - break; - case RPC_FC_WCHAR: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_WCHAR */\n", var->type->type); - break; - case RPC_FC_USHORT: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_USHORT */\n", var->type->type); - break; - case RPC_FC_SHORT: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_SHORT */\n", var->type->type); - break; - case RPC_FC_ULONG: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_ULONG */\n", var->type->type); - break; - case RPC_FC_LONG: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_LONG */\n", var->type->type); - break; - case RPC_FC_HYPER: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_HYPER */\n", var->type->type); - break; - case RPC_FC_SMALL: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_SMALL */\n", RPC_FC_SMALL); - break; - case RPC_FC_FLOAT: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_FLOAT */\n", RPC_FC_FLOAT); - break; - case RPC_FC_DOUBLE: - print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_DOUBLE */\n", RPC_FC_DOUBLE); - break; - default: - error("Unknown/unsupported type\n"); - } + error("Unknown/unsupported type\n"); + return; } func = PREV_LINK(func); @@ -213,8 +151,11 @@ } -static void write_typeformatstring(void) +static void write_typeformatstring(type_t *iface) { + func_t *func = iface->funcs; + var_t *var; + print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); indent++; @@ -222,6 +163,42 @@ print_server("{\n"); indent++; print_server("NdrFcShort(0x0),\n"); + + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } + + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + { + print_server("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); + print_server("0x%02x, /* FC_<type> */\n", var->type->type); + print_server("0x5c, /* FC_PAD */\n"); + } + } + + var = PREV_LINK(var); + } + } + + + + func = PREV_LINK(func); + } + print_server("0x0\n"); indent--; print_server("}\n"); @@ -260,6 +237,35 @@ } +static void init_pointers (func_t *func) +{ + var_t *var; + + if (!func->args) + return; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 1) + { + print_server("("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR *)%s = 0;\n", var->name); + } + else if (var->ptr_level > 1) + { + error("Pointer level %d not supported!\n", var->ptr_level); + return; + } + + var = PREV_LINK(var); + } + fprintf(server, "\n"); +} + + static void unmarshall_arguments(func_t *func) { unsigned int alignment; @@ -320,12 +326,32 @@ if (alignment != 0) print_server("_StubMsg.Buffer += %u;\n", alignment); - print_server(""); - write_name(server, var); - fprintf(server, " = *(("); - write_type(server, var->type, var, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); - fprintf(server, "\n"); + if (var->ptr_level == 0) + { + print_server(""); + write_name(server, var); + fprintf(server, " = *(("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(server, "\n"); + } + else if (var->ptr_level == 1) + { + print_server(""); + write_name(server, var); + fprintf(server, " = ("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); + fprintf(server, "\n"); + } + else + { + error("Pointer level %d is not supported!\n", var->ptr_level); + return; + } last_size = size; } @@ -424,6 +450,8 @@ fprintf(server, "\n"); } + init_pointers(func); + print_server("RpcTryFinally\n"); print_server("{\n"); indent++; @@ -666,15 +694,47 @@ print_server("\n"); } +static int get_type_format_string_size(type_t *iface) +{ + int size = 3; + func_t *func; + var_t *var; -static void write_formatstringsdecl(type_t *iface) + /* determine the proc format string size */ + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 1) + { + if (is_base_type(var->type)) + size += 4; + } + + var = PREV_LINK(var); + } + } + + func = PREV_LINK(func); + } + + return size; +} + + +static int get_proc_format_string_size(type_t *iface) { + int size = 1; func_t *func; var_t *var; - int byte_count = 1; - print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ - /* determine the proc format string size */ func = iface->funcs; while (NEXT_LINK(func)) func = NEXT_LINK(func); @@ -687,17 +747,40 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - byte_count += 2; /* FIXME: determine real size */ + switch (var->ptr_level) + { + case 0: + if (is_base_type(var->type)) + size += 2; + break; + + case 1: + if (is_base_type(var->type)) + size += 4; + break; + } + var = PREV_LINK(var); } } /* return value size */ - byte_count += 2; /* FIXME: determine real size */ + size += 2; func = PREV_LINK(func); } - print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + return size; +} + + [truncated at 1000 lines; 20 more skipped]

19 years, 8 months

[gvg] 13849: Fix compilation with DBG := 1 and KDBG := 0

by gvg＠svn.reactos.com

Fix compilation with DBG := 1 and KDBG := 0 Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-03-06 07:38:54 UTC (rev 13848) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-03-06 10:44:38 UTC (rev 13849) @@ -107,7 +107,6 @@ #if !defined(KDBG) && !defined(DBG) # define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) # define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) # define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) @@ -115,7 +114,6 @@ # define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) #else # define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) # define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) # define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) # define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) @@ -123,8 +121,6 @@ /*#define KDB_CREATE_THREAD_HOOK(CONTEXT) \ KdbCreateThreadHook(CONTEXT) */ -VOID -KdbDeleteProcessHook(IN PEPROCESS Process); VOID KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); @@ -159,7 +155,15 @@ #endif /* KDBG || DBG */ +#if !defined(KDBG) +# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) +#else +# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) VOID +KdbDeleteProcessHook(IN PEPROCESS Process); +#endif /* KDBG */ + +VOID DebugLogDumpMessages(VOID); #endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-03-06 07:38:54 UTC (rev 13848) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-03-06 10:44:38 UTC (rev 13849) @@ -696,10 +696,12 @@ KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); } +#if defined(KDBG) + KdbInit(); +#endif /* KDBG */ #if defined(KDBG) || defined(DBG) - KdbInit(); KdbInitProfiling2(); -#endif /* KDBG */ +#endif /* KDBG || DBG */ /* On the assumption that we can now access disks start up the debug * logger thread */

19 years, 8 months

[ros-diffs] [arty] 13848: This directory contained both [Mm]akefile, which were identical. Makefile

by arty＠svn.reactos.com

This directory contained both [Mm]akefile, which were identical. Makefile removed. Deleted: branches/xmlbuildsystem/reactos/tools/wrc/Makefile _____ Deleted: branches/xmlbuildsystem/reactos/tools/wrc/Makefile --- branches/xmlbuildsystem/reactos/tools/wrc/Makefile 2005-03-06 05:32:54 UTC (rev 13847) +++ branches/xmlbuildsystem/reactos/tools/wrc/Makefile 2005-03-06 07:38:54 UTC (rev 13848) @@ -1,39 +0,0 @@ -WRC_BASE = tools$(SEP)wrc - -WRC_TARGET = \ - $(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX) - -WRC_SOURCES = \ - $(WRC_BASE)$(SEP)dumpres.c \ - $(WRC_BASE)$(SEP)genres.c \ - $(WRC_BASE)$(SEP)newstruc.c \ - $(WRC_BASE)$(SEP)readres.c \ - $(WRC_BASE)$(SEP)translation.c \ - $(WRC_BASE)$(SEP)utils.c \ - $(WRC_BASE)$(SEP)wrc.c \ - $(WRC_BASE)$(SEP)writeres.c \ - $(WRC_BASE)$(SEP)y.tab.c \ - $(WRC_BASE)$(SEP)lex.yy.c \ - $(WRC_BASE)$(SEP)port$(SEP)mkstemps.o - -WRC_OBJECTS = \ - $(WRC_SOURCES:.c=.o) - -WRC_HOST_CFLAGS = -I$(WRC_BASE) -g -Werror -Wall \ - -D__USE_W32API -DWINE_UNICODE_API= \ - -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -I$(WPP_BASE) -I$(WRC_BASE) \ - -Iinclude/wine -Iinclude -Iw32api/include - -WRC_HOST_LFLAGS = -g - -$(WRC_TARGET): $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) - ${host_gcc} $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) $(WRC_HOST_LFLAGS) -o $(WRC_TARGET) - -$(WRC_OBJECTS): %.o : %.c - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wrc_clean -wrc_clean: - -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL) -clean: wrc_clean

19 years, 8 months

[ion] 13847: Merge with 13846. Fixes QEMU+KDBG problem.

by ion＠svn.reactos.com

Merge with 13846. Fixes QEMU+KDBG problem. Modified: branches/alex_devel_branch/reactos/Makefile Deleted: branches/alex_devel_branch/reactos/media/drivers/etc/KDB.init Added: branches/alex_devel_branch/reactos/media/drivers/etc/KDBinit Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_cli.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_keyboard.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_serial.c _____ Modified: branches/alex_devel_branch/reactos/Makefile --- branches/alex_devel_branch/reactos/Makefile 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/Makefile 2005-03-06 05:32:54 UTC (rev 13847) @@ -216,8 +216,8 @@ $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls $(HALFVERBOSEECHO) [COPY] media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services - $(HALFVERBOSEECHO) [COPY] media/drivers/etc/KDB.init to $(BOOTCD_DIR)/reactos/KDB.init - $(CP) media/drivers/etc/KDB.init $(BOOTCD_DIR)/reactos/KDB.init + $(HALFVERBOSEECHO) [COPY] media/drivers/etc/KDBinit to $(BOOTCD_DIR)/reactos/KDBinit + $(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before @@ -1045,8 +1045,8 @@ $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services $(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services - $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/KDB.init to $(INSTALL_DIR)/system32/drivers/etc/KDB.init - $(CP) media/drivers/etc/KDB.init $(INSTALL_DIR)/system32/drivers/etc/KDB.init + $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/KDBinit to $(INSTALL_DIR)/system32/drivers/etc/KDBinit + $(CP) media/drivers/etc/KDBinit $(INSTALL_DIR)/system32/drivers/etc/KDBinit .PHONY: install_clean install_dirs install_before _____ Deleted: branches/alex_devel_branch/reactos/media/drivers/etc/KDB.init --- branches/alex_devel_branch/reactos/media/drivers/etc/KDB.init 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/media/drivers/etc/KDB.init 2005-03-06 05:32:54 UTC (rev 13847) @@ -1,15 +0,0 @@ -# Example KDB.init file -# -# The disassembly flavor is set to "intel" (default is "at&t") and the -# - -# Set the disassembly flavor to "intel" (default is "at&t") -set syntax intel - -# Change the condition to enter KDB on INT3 to "always" (default is "kmode") -set condition INT3 first always - -# This is a special command available only in the KDB.init file - it breaks into -# KDB when it is interpreting the init file at startup. -#break - _____ Copied: branches/alex_devel_branch/reactos/media/drivers/etc/KDBinit (from rev 13846, trunk/reactos/media/drivers/etc/KDBinit) _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb.h --- branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb.h 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb.h 2005-03-06 05:32:54 UTC (rev 13847) @@ -272,10 +272,15 @@ #define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) #define KdbpSafeWriteMemory(dst, src, size) MmSafeCopyToUser(dst, src, size) + +#define KdbpGetCharKeyboard(ScanCode) KdbpTryGetCharKeyboard(ScanCode, 0) CHAR -KdbpTryGetCharKeyboard(PULONG ScanCode); -ULONG -KdbpTryGetCharSerial(VOID); +KdbpTryGetCharKeyboard(PULONG ScanCode, UINT Retry); + +#define KdbpGetCharSerial() KdbpTryGetCharSerial(0) +CHAR +KdbpTryGetCharSerial(UINT Retry); + VOID KdbEnter(VOID); VOID _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_cli.c --- branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_cli.c 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_cli.c 2005-03-06 05:32:54 UTC (rev 13847) @@ -97,7 +97,7 @@ STATIC LONG KdbNumberOfRowsTerminal = -1; STATIC LONG KdbNumberOfColsTerminal = -1; -PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDB.init file is loaded into during initialization */ +PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ STATIC CONST struct { @@ -1682,6 +1682,7 @@ INT Length; INT i; INT RowsPrintedByTerminal; + ULONG ScanCode; va_list ap; /* Check if the user has aborted output of the current command */ @@ -1703,20 +1704,17 @@ { /* Try to query number of rows from terminal. A reply looks like "\x1b[8;24;80t" */ TerminalReportsSize = FALSE; - DbgPrint("\x1b[18t"); - i = 10; - while ((i-- > 0) && ((c = KdbpTryGetCharSerial()) == -1)); + //DbgPrint("\x1b[18t"); + c = KdbpTryGetCharSerial(10); if (c == KEY_ESC) { - i = 5; - while ((i-- > 0) && ((c = KdbpTryGetCharSerial()) == -1)); + c = KdbpTryGetCharSerial(5); if (c == '[') { Length = 0; for (;;) { - i = 5; - while ((i-- > 0) && ((c = KdbpTryGetCharSerial()) == -1)); + c = KdbpTryGetCharSerial(5); if (c == -1) break; Buffer[Length++] = c; @@ -1781,13 +1779,19 @@ if (KdbNumberOfColsPrinted > 0) DbgPrint("\n"); DbgPrint("--- Press q to abort, any other key to continue ---"); - while ((c = KdbpTryGetCharSerial()) == -1); + if (KdDebugState & KD_DEBUG_KDSERIAL) + c = KdbpGetCharSerial(); + else + c = KdbpGetCharKeyboard(&ScanCode); if (c == '\r') { - /* Ignore \r and wait for \n or another \r - if \n is not received here + /* Try to read '\n' which might follow '\r' - if \n is not received here * it will be interpreted as "return" when the next command should be read. */ - while ((c = KdbpTryGetCharSerial()) == -1); + if (KdDebugState & KD_DEBUG_KDSERIAL) + c = KdbpTryGetCharSerial(5); + else + c = KdbpTryGetCharKeyboard(&ScanCode, 5); } DbgPrint("\n"); if (c == 'q') @@ -1914,7 +1918,7 @@ OUT PCHAR Buffer, IN ULONG Size) { - CHAR Key; + CHAR Key, NextKey; PCHAR Orig = Buffer; ULONG ScanCode = 0; BOOLEAN EchoOn; @@ -1929,14 +1933,14 @@ { if (KdDebugState & KD_DEBUG_KDSERIAL) { - while ((Key = KdbpTryGetCharSerial()) == -1); + Key = KdbpGetCharSerial(); ScanCode = 0; if (Key == KEY_ESC) /* ESC */ { - while ((Key = KdbpTryGetCharSerial()) == -1); + Key = KdbpGetCharSerial(); if (Key == '[') { - while ((Key = KdbpTryGetCharSerial()) == -1); + Key = KdbpGetCharSerial(); switch (Key) { case 'A': @@ -1954,7 +1958,9 @@ } } else - while ((Key = KdbpTryGetCharKeyboard(&ScanCode)) == -1); + { + Key = KdbpGetCharKeyboard(&ScanCode); + } if ((Buffer - Orig) >= (Size - 1)) { @@ -1965,10 +1971,13 @@ if (Key == '\r') { - /* Ignore this key... */ - } - else if (Key == '\n') - { + /* Read the next char - this is to throw away a \n which most clients should + * send after \r. + */ + if (KdDebugState & KD_DEBUG_KDSERIAL) + NextKey = KdbpTryGetCharSerial(5); + else + NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5); DbgPrint("\n"); /* * Repeat the last command if the user presses enter. Reduces the @@ -2197,7 +2206,7 @@ CHAR c; /* Execute the commands in the init file */ - DbgPrint("KDB: Executing KDB.init file...\n"); + DbgPrint("KDB: Executing KDBinit file...\n"); p1 = KdbInitFileBuffer; while (p1[0] != '\0') { @@ -2228,12 +2237,12 @@ while (p1[0] == '\r' || p1[0] == '\n') p1++; } - DbgPrint("KDB: KDB.init executed\n"); + DbgPrint("KDB: KDBinit executed\n"); } /*!\brief Called when KDB is initialized * - * Reads the KDB.init file from the SystemRoot\system32\drivers\etc directory and executes it. + * Reads the KDBinit file from the SystemRoot\system32\drivers\etc directory and executes it. */ VOID KdbpCliInit() @@ -2249,7 +2258,7 @@ ULONG OldEflags; /* Initialize the object attributes */ - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDB.init"); + RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDBinit"); InitializeObjectAttributes(&ObjectAttributes, &FileName, 0, NULL, NULL); /* Open the file */ @@ -2258,7 +2267,7 @@ FILE_NO_INTERMEDIATE_BUFFERING); if (!NT_SUCCESS(Status)) { - DPRINT("Could not open \\SystemRoot\\system32\\drivers\\etc\\KDB.init (Status 0x%x)", Status); + DPRINT("Could not open \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); return; } @@ -2268,7 +2277,7 @@ if (!NT_SUCCESS(Status)) { ZwClose(hFile); - DPRINT("Could not query size of \\SystemRoot\\system32\\drivers\\etc\\KDB.init (Status 0x%x)", Status); + DPRINT("Could not query size of \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); return; } FileSize = FileStdInfo.EndOfFile.u.LowPart; @@ -2278,7 +2287,7 @@ if (FileBuffer == NULL) { ZwClose(hFile); - DPRINT("Could not allocate %d bytes for KDB.init file\n", FileSize); + DPRINT("Could not allocate %d bytes for KDBinit file\n", FileSize); return; } @@ -2288,7 +2297,7 @@ if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) { ExFreePool(FileBuffer); - DPRINT("Could not read KDB.init file into memory (Status 0x%lx)\n", Status); + DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status); return; } FileSize = min(FileSize, Iosb.Information); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_keyboard.c --- branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_keyboard.c 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_keyboard.c 2005-03-06 05:32:54 UTC (rev 13847) @@ -62,12 +62,13 @@ } CHAR -KdbpTryGetCharKeyboard(PULONG ScanCode) +KdbpTryGetCharKeyboard(PULONG ScanCode, UINT Retry) { static byte_t last_key = 0; static byte_t shift = 0; char c; - while(1) { + BOOLEAN KeepRetrying = (Retry == 0); + while (KeepRetrying || Retry-- > 0) { unsigned char status = kbd_read_status(); while (status & KBD_STAT_OBF) { byte_t scancode; @@ -91,6 +92,8 @@ } } } + + return -1; } #endif _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_serial.c --- branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_serial.c 2005-03-06 02:34:18 UTC (rev 13846) +++ branches/alex_devel_branch/reactos/ntoskrnl/dbg/kdb_serial.c 2005-03-06 05:32:54 UTC (rev 13847) @@ -20,11 +20,14 @@ CHAR -KdbpTryGetCharSerial() +KdbpTryGetCharSerial(UINT Retry) { - UCHAR Result; + CHAR Result = -1; - while( !KdPortGetByteEx (&LogPortInfo, &Result) ); + if (Retry == 0) + while (!KdPortGetByteEx(&LogPortInfo, (PUCHAR)&Result)); + else + while (!KdPortGetByteEx(&LogPortInfo, (PUCHAR)&Result) && Retry-- > 0); return Result; }

19 years, 8 months

← Newer
1
...
52
53
54
55
56
57
58
...
61
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 March 2005