Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 14315: reorder GenerateRules() to get rid of unnecessary if()
by royce＠svn.reactos.com 25 Mar '05

25 Mar '05

reorder GenerateRules() to get rid of unnecessary if() Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 16:32:46 UTC (rev 14314) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 17:08:30 UTC (rev 14315) @@ -1281,23 +1281,20 @@ module.name.c_str (), GetTargetMacro ( module ).c_str () ); - string ar_target; if ( module.type != ObjectLibrary ) - ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - - GenerateObjectFileTargets ( cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro ); - - if ( module.type != ObjectLibrary ) { + string ar_target ( GenerateArchiveTarget ( ar, objectsMacro ) ); if ( targetMacro != ar_target ) { CLEAN_FILE ( ar_target ); } } + + GenerateObjectFileTargets ( cc, + cppc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); } void

1 0

[chorns] 14314: Output rules for objectlibrary files
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Output rules for objectlibrary files Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-25 15:48:03 UTC (rev 14313) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-25 16:32:46 UTC (rev 14314) @@ -143,6 +143,7 @@ for ( i = 0; i < iend; i++ ) v[i]->GenerateObjectMacro(); + fprintf ( fMakefile, "\n" ); for ( i = 0; i < iend; i++ ) v[i]->GenerateTargetMacro(); fprintf ( fMakefile, "\n" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 15:48:03 UTC (rev 14313) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 16:32:46 UTC (rev 14314) @@ -1234,7 +1234,7 @@ fprintf ( fMakefile, - "%s += $(%s)", + "%s += $(%s)\n", linkDepsMacro.c_str (), libsMacro.c_str () ); @@ -1281,17 +1281,18 @@ module.name.c_str (), GetTargetMacro ( module ).c_str () ); + string ar_target; if ( module.type != ObjectLibrary ) - { - string ar_target = - GenerateArchiveTarget ( ar, objectsMacro ); + ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - GenerateObjectFileTargets ( cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro ); + GenerateObjectFileTargets ( cc, + cppc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); + if ( module.type != ObjectLibrary ) + { if ( targetMacro != ar_target ) { CLEAN_FILE ( ar_target ); @@ -1722,8 +1723,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = objectsMacro + " " + linkDepsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.entrypoint.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-25 15:48:03 UTC (rev 14313) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-25 16:32:46 UTC (rev 14314) @@ -561,11 +561,6 @@ if ( HasImportLibrary () ) { return ReplaceExtension ( GetPath(), ".a" ); - /*return ssprintf ( "dk%cnkm%clib%clib%s.a", - CSEP, - CSEP, - CSEP, - name.c_str () );*/ } else return GetPath();

1 0

[navaraf] 14313: Fix a typo.
by navaraf＠svn.reactos.com 25 Mar '05

25 Mar '05

Fix a typo. Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-03-25 14:37:08 UTC (rev 14312) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-03-25 15:48:03 UTC (rev 14313) @@ -21,7 +21,7 @@ * Limitations: * - No support for compressed files. * - No attribute list support. - * - May crash on currupted filesystem. + * - May crash on corrupted filesystem. */ #include <freeldr.h>

1 0

[chorns] 14312: Revert part of previous change
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Revert part of previous change Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/tools.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-25 14:31:00 UTC (rev 14311) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-25 14:37:08 UTC (rev 14312) @@ -38,7 +38,7 @@ .PHONY: cabman cabman: $(CABMAN_TARGET) -$(CABMAN_TARGET1): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) +$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) $(ECHO_LD) ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-25 14:31:00 UTC (rev 14311) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-25 14:37:08 UTC (rev 14312) @@ -5,13 +5,11 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -.LOW_RESOLUTION_TIME: $(TOOLS_INT) $(TOOLS_INT): $(INTERMEDIATE) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) -.LOW_RESOLUTION_TIME: $(TOOLS_OUT) $(TOOLS_OUT): $(OUTPUT) $(ECHO_MKDIR) ${mkdir} $@

1 0

[chorns] 14311: Generate object macros before target macros
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Generate object macros before target macros Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/tools.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-25 13:40:33 UTC (rev 14310) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-25 14:31:00 UTC (rev 14311) @@ -38,7 +38,7 @@ .PHONY: cabman cabman: $(CABMAN_TARGET) -$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) +$(CABMAN_TARGET1): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) $(CABMAN_OUT) $(ECHO_LD) ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-25 13:40:33 UTC (rev 14310) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-25 14:31:00 UTC (rev 14311) @@ -142,6 +142,8 @@ size_t iend = v.size (); for ( i = 0; i < iend; i++ ) + v[i]->GenerateObjectMacro(); + for ( i = 0; i < iend; i++ ) v[i]->GenerateTargetMacro(); fprintf ( fMakefile, "\n" ); @@ -419,26 +421,6 @@ d.CreateRule ( fMakefile, "" ); if ( i ) fprintf ( fMakefile, "endif\n" ); } - /*if ( directories.size () == 0 ) - return; - - set_string::iterator i; - for ( i = directories.begin (); - i != directories.end (); - i++ ) - { - if ( IncludeDirectoryTarget ( *i ) ) - { - fprintf ( fMakefile, - "%s: $(RMKDIR_TARGET)\n", - i->c_str () ); - fprintf ( fMakefile, - "\t${mkdir} %s\n\n", - i->c_str () ); - } - } - - directories.clear ();*/ } string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 13:40:33 UTC (rev 14310) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-25 14:31:00 UTC (rev 14311) @@ -614,6 +614,42 @@ } } + const vector<If*>& ifs = data.ifs; + for ( i = 0; i < ifs.size(); i++ ) + { + If& rIf = *ifs[i]; + if ( rIf.data.defines.size() + || rIf.data.includes.size() + || rIf.data.libraries.size() + || rIf.data.files.size() + || rIf.data.ifs.size() ) + { + fprintf ( + fMakefile, + "ifeq (\"$(%s)\",\"%s\")\n", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateMacros ( + "+=", + rIf.data, + NULL, + NULL ); + fprintf ( + fMakefile, + "endif\n\n" ); + } + } +} + +void +MingwModuleHandler::GenerateObjectMacros ( + const char* assignmentOperation, + const IfableData& data, + const vector<CompilerFlag*>* compilerFlags, + const vector<LinkerFlag*>* linkerFlags ) +{ + size_t i; + const vector<File*>& files = data.files; if ( files.size () > 0 ) { @@ -666,7 +702,7 @@ "ifeq (\"$(%s)\",\"%s\")\n", rIf.property.c_str(), rIf.value.c_str() ); - GenerateMacros ( + GenerateObjectMacros ( "+=", rIf.data, NULL, @@ -887,7 +923,7 @@ const string& libsMacro ) { string target ( GetTargetMacro ( module ) ); - string target_folder ( GetDirectory(GetTargetFilename(module,NULL)) ); + string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) ); fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET)\n", @@ -1107,13 +1143,37 @@ module.name.c_str () ); } +string +MingwModuleHandler::GetModuleTargets ( const Module& module ) +{ + if ( module.type == ObjectLibrary ) + return GetObjectsMacro ( module ); + else + return GetTargetFilename ( module, NULL ); +} + void +MingwModuleHandler::GenerateObjectMacro () +{ + objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); + + GenerateObjectMacros ( + "=", + module.non_if_data, + &module.compilerFlags, + &module.linkerFlags ); + + // future references to the macro will be to get its values + objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); +} + +void MingwModuleHandler::GenerateTargetMacro () { fprintf ( fMakefile, "%s := %s\n", - GetTargetMacro(module,false).c_str (), - GetTargetFilename(module,NULL).c_str () ); + GetTargetMacro ( module, false ).c_str (), + GetModuleTargets ( module ).c_str () ); } void @@ -1123,7 +1183,6 @@ nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); linkerflagsMacro = ssprintf ("%s_LFLAGS", module.name.c_str ()); - objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); libsMacro = ssprintf("%s_LIBS", module.name.c_str ()); linkDepsMacro = ssprintf ("%s_LINKDEPS", module.name.c_str ()); @@ -1202,7 +1261,6 @@ // future references to the macros will be to get their values cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); - objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-25 13:40:33 UTC (rev 14310) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-25 14:31:00 UTC (rev 14311) @@ -36,6 +36,8 @@ const Module& module, string_list* pclean_files ); + std::string GetModuleTargets ( const Module& module ); + void GenerateObjectMacro(); void GenerateTargetMacro(); void GenerateOtherMacros(); @@ -101,6 +103,10 @@ const IfableData& data, const std::vector<CompilerFlag*>* compilerFlags, const std::vector<LinkerFlag*>* linkerFlags ); + void GenerateObjectMacros ( const char* assignmentOperation, + const IfableData& data, + const std::vector<CompilerFlag*>* compilerFlags, + const std::vector<LinkerFlag*>* linkerFlags ); std::string GenerateGccIncludeParameters () const; std::string GenerateGccParameters () const; std::string GenerateNasmParameters () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-25 13:40:33 UTC (rev 14310) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-25 14:31:00 UTC (rev 14311) @@ -5,11 +5,13 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) +.LOW_RESOLUTION_TIME: $(TOOLS_INT) $(TOOLS_INT): $(INTERMEDIATE) $(ECHO_MKDIR) ${mkdir} $@ ifneq ($(INTERMEDIATE),$(OUTPUT)) +.LOW_RESOLUTION_TIME: $(TOOLS_OUT) $(TOOLS_OUT): $(OUTPUT) $(ECHO_MKDIR) ${mkdir} $@

1 0

[hbirr] 14310: - Implemented NpfsCleanup.
by hbirr＠svn.reactos.com 25 Mar '05

25 Mar '05

- Implemented NpfsCleanup. - Moved most of the code from NpfsClose to NpfsCleanup. - If a pipe handle is closed, remove the fcb from the wait list and cancel a connecting irp if one is waiting. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/npfs.c Modified: trunk/reactos/drivers/fs/np/npfs.h _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-03-25 13:02:35 UTC (rev 14309) +++ trunk/reactos/drivers/fs/np/create.c 2005-03-25 13:40:33 UTC (rev 14310) @@ -92,7 +92,7 @@ { DPRINT("Server found! Fcb %p\n", Waiter->Fcb); - Waiter->Irp->IoStatus.Status = FILE_PIPE_CONNECTED_STATE; + Waiter->Irp->IoStatus.Status = STATUS_PIPE_CONNECTED; Waiter->Irp->IoStatus.Information = 0; IoCompleteRequest(Waiter->Irp, IO_NO_INCREMENT); @@ -467,10 +467,9 @@ if (NewPipe) { - /* - * FIXME: - * Lock the pipelist and remove the pipe from the list. - */ + KeLockMutex(&DeviceExt->PipeListLock); + RemoveEntryList(&Pipe->PipeListEntry); + KeUnlockMutex(&DeviceExt->PipeListLock); RtlFreeUnicodeString(&Pipe->PipeName); ExFreePool(Pipe); } @@ -494,10 +493,6 @@ Pipe->CurrentInstances++; - KeLockMutex(&Pipe->FcbListLock); - InsertTailList(&Pipe->ServerFcbListHead, &Fcb->FcbListEntry); - KeUnlockMutex(&Pipe->FcbListLock); - Fcb->Pipe = Pipe; Fcb->PipeEnd = FILE_PIPE_SERVER_END; Fcb->PipeState = FILE_PIPE_LISTENING_STATE; @@ -511,6 +506,10 @@ SynchronizationEvent, FALSE); + KeLockMutex(&Pipe->FcbListLock); + InsertTailList(&Pipe->ServerFcbListHead, &Fcb->FcbListEntry); + KeUnlockMutex(&Pipe->FcbListLock); + FileObject->FsContext = Fcb; Irp->IoStatus.Status = STATUS_SUCCESS; @@ -523,8 +522,8 @@ NTSTATUS STDCALL -NpfsClose(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NpfsCleanup(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; @@ -533,7 +532,7 @@ PNPFS_PIPE Pipe; BOOL Server; - DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); + DPRINT("NpfsCleanup(DeviceObject %p Irp %p)\n", DeviceObject, Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -552,7 +551,7 @@ DPRINT("Fcb %x\n", Fcb); Pipe = Fcb->Pipe; - DPRINT("Closing pipe %wZ\n", &Pipe->PipeName); + DPRINT("Cleaning pipe %wZ\n", &Pipe->PipeName); KeLockMutex(&Pipe->FcbListLock); @@ -562,7 +561,6 @@ { /* FIXME: Clean up existing connections here ?? */ DPRINT("Server\n"); - Pipe->CurrentInstances--; } else { @@ -573,7 +571,7 @@ { if (Fcb->OtherSide) { - Fcb->OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; + Fcb->OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; Fcb->OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other @@ -581,15 +579,119 @@ */ KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); } + } + else if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + { + PLIST_ENTRY Entry; + PNPFS_WAITER_ENTRY WaitEntry = NULL; + BOOLEAN Complete = FALSE; + KIRQL oldIrql; - Fcb->PipeState = 0; + Entry = Fcb->Pipe->WaiterListHead.Flink; + while (Entry != &Fcb->Pipe->WaiterListHead) + { + WaitEntry = CONTAINING_RECORD(Entry, NPFS_WAITER_ENTRY, Entry); + if (WaitEntry->Fcb == Fcb) + { + RemoveEntryList(Entry); + IoAcquireCancelSpinLock(&oldIrql); + if (!Irp->Cancel) + { + IoSetCancelRoutine(WaitEntry->Irp, NULL); + Complete = TRUE; + } + IoReleaseCancelSpinLock(oldIrql); + break; + } + Entry = Entry->Flink; + } + + if (Entry != &Fcb->Pipe->WaiterListHead) + { + if (Complete) + { + WaitEntry->Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + WaitEntry->Irp->IoStatus.Information = 0; + IoCompleteRequest(WaitEntry->Irp, IO_NO_INCREMENT); + } + ExFreePool(WaitEntry); + } } + Fcb->PipeState = FILE_PIPE_CLOSING_STATE; + KeUnlockMutex(&Pipe->FcbListLock); + + ExAcquireFastMutex(&Fcb->DataListLock); + if (Fcb->Data) + { + ExFreePool(Fcb->Data); + Fcb->Data = NULL; + Fcb->ReadPtr = NULL; + Fcb->WritePtr = NULL; + } + ExReleaseFastMutex(&Fcb->DataListLock); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + DPRINT("Success!\n"); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +NpfsClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PNPFS_DEVICE_EXTENSION DeviceExt; + PIO_STACK_LOCATION IoStack; + PFILE_OBJECT FileObject; + PNPFS_FCB Fcb; + PNPFS_PIPE Pipe; + BOOL Server; + + DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FileObject = IoStack->FileObject; + Fcb = FileObject->FsContext; + + if (Fcb == NULL) + { + DPRINT("Success!\n"); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + DPRINT("Fcb %x\n", Fcb); + Pipe = Fcb->Pipe; + + DPRINT("Closing pipe %wZ\n", &Pipe->PipeName); + + KeLockMutex(&Pipe->FcbListLock); + + Server = (Fcb->PipeEnd == FILE_PIPE_SERVER_END); + + if (Server) + { + DPRINT("Server\n"); + Pipe->CurrentInstances--; + } + else + { + DPRINT("Client\n"); + } + + ASSERT (Fcb->PipeState == FILE_PIPE_CLOSING_STATE); + FileObject->FsContext = NULL; RemoveEntryList(&Fcb->FcbListEntry); - if (Fcb->Data) - ExFreePool(Fcb->Data); + ExFreePool(Fcb); KeUnlockMutex(&Pipe->FcbListLock); _____ Modified: trunk/reactos/drivers/fs/np/npfs.c --- trunk/reactos/drivers/fs/np/npfs.c 2005-03-25 13:02:35 UTC (rev 14309) +++ trunk/reactos/drivers/fs/np/npfs.c 2005-03-25 13:40:33 UTC (rev 14310) @@ -40,7 +40,7 @@ NpfsSetInformation; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NpfsQueryVolumeInformation; -// DriverObject->MajorFunction[IRP_MJ_CLEANUP] = NpfsCleanup; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = NpfsCleanup; DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpfsFlushBuffers; // DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = // NpfsDirectoryControl; _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-03-25 13:02:35 UTC (rev 14309) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-03-25 13:40:33 UTC (rev 14310) @@ -99,6 +99,7 @@ NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS STDCALL NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp);

1 0

[chorns] 14309: Enable rbuild_test again
by chorns＠svn.reactos.com 25 Mar '05

25 Mar '05

Enable rbuild_test again Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-25 12:00:56 UTC (rev 14308) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-25 13:02:35 UTC (rev 14309) @@ -52,6 +52,23 @@ endif +RBUILD_TESTS_BASE = $(RBUILD_BASE_)tests +RBUILD_TESTS_BASE_ = $(RBUILD_TESTS_BASE)$(SEP) +RBUILD_TESTS_INT = $(INTERMEDIATE_)$(RBUILD_TESTS_BASE) +RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP) +RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE) + +$(RBUILD_TESTS_INT): $(RBUILD_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_TESTS_OUT): $(RBUILD_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + + RBUILD_DEVCPP_BASE = $(RBUILD_BACKEND_BASE_)devcpp RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP) RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE) @@ -236,24 +253,59 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -#$(RBUILD_COMMON_OBJECTS): %.o: %.cpp $(RBUILD_INT) -# $(ECHO_CC) -# ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT) + $(ECHO_LD) + ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ -#$(RBUILD_SPECIAL_OBJECTS): %.o: %.cpp $(RBUILD_INT) -# $(ECHO_CC) -# ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -#$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT) -# $(ECHO_LD) -# ${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ +$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -#$(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp $(RBUILD_INT) -# $(ECHO_CC) -# ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + + .PHONY: rbuild_test rbuild_test: $(RBUILD_TEST_TARGET) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-03-25 12:00:56 UTC (rev 14308) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-03-25 13:02:35 UTC (rev 14309) @@ -5,5 +5,5 @@ void FunctionTest::Run () { string fixedupFilename = FixupTargetFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); - ARE_EQUAL ( "$(INTERMEDIATE)dir1" SSEP "filename.txt", fixedupFilename ); + ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename ); }

1 0

[navaraf] 14308: Fix uninitialized variable warnings.
by navaraf＠svn.reactos.com 25 Mar '05

25 Mar '05

Fix uninitialized variable warnings. Modified: trunk/reactos/drivers/dd/serial/rw.c _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-03-25 11:45:48 UTC (rev 14307) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-03-25 12:00:56 UTC (rev 14308) @@ -76,8 +76,8 @@ DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant == 0 && DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == 0)) { - ULONG IntervalTimeout; - ULONG TotalTimeout; + ULONG IntervalTimeout = 0; + ULONG TotalTimeout = 0; BOOLEAN UseIntervalTimeout = FALSE; BOOLEAN UseTotalTimeout = FALSE; ULONG ThisByteTimeout;

1 0

[hbirr] 14307: Reverted my last changes which allows to read from a listening pipe.
by hbirr＠svn.reactos.com 25 Mar '05

25 Mar '05

Reverted my last changes which allows to read from a listening pipe. Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-03-25 11:25:44 UTC (rev 14306) +++ trunk/reactos/drivers/fs/np/rw.c 2005-03-25 11:45:48 UTC (rev 14307) @@ -283,8 +283,7 @@ goto done; } - if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE && - !(Fcb->PipeState == FILE_PIPE_LISTENING_STATE && Fcb->PipeEnd == FILE_PIPE_SERVER_END)) + if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) { DPRINT("PipeState: %x\n", Fcb->PipeState); Status = STATUS_PIPE_BROKEN;

1 0

[hbirr] 14306: Fixed the return value and last error in ConnectNamedPipe if a overlapped structure is given.
by hbirr＠svn.reactos.com 25 Mar '05

25 Mar '05

Fixed the return value and last error in ConnectNamedPipe if a overlapped structure is given. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-03-25 11:05:10 UTC (rev 14305) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-03-25 11:25:44 UTC (rev 14306) @@ -330,20 +330,15 @@ 0, NULL, 0); - if ((lpOverlapped != NULL) && (Status == STATUS_PENDING)) - return TRUE; - if ((lpOverlapped == NULL) && (Status == STATUS_PENDING)) { Status = NtWaitForSingleObject(hNamedPipe, FALSE, NULL); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); - return FALSE; + Status = Iosb.Status; } - Status = Iosb.Status; } if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) ||

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs