Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49650: [SPEC2DEF] - Fix handling of multiple arches - Remove unused code
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 00:36:00 2010 New Revision: 49650 URL: http://svn.reactos.org/svn/reactos?rev=49650&view=rev Log: [SPEC2DEF] - Fix handling of multiple arches - Remove unused code Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 00:36:00 2010 @@ -40,7 +40,7 @@ int IsSeparator(char chr) { - return ((chr <= '*' && chr != '$') || + return ((chr <= ',' && chr != '$') || (chr >= ':' && chr < '?') ); } @@ -174,59 +174,6 @@ { fprintf(fileDest, "@%d", exp->nStackBytes); } - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) - { - fprintf(fileDest, " DATA"); - } - - fprintf(fileDest, "\n"); - - return 1; -} - -void -OutputHeader_pdef(FILE *file, char *libname) -{ - fprintf(file, - "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" - "EXPORTS\n" - "#define FOOL(x) x\n" - "#if defined(__GNUC__) && defined(_X86_)\n" - "#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes\n" - "#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes\n" - "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n" - "#else\n" - "#define _NAME_STDCALL(name, stackbytes) name\n" - "#define _NAME_FASTCALL(name, stackbytes) name\n" - "#define _NAME_CDECL(name, stackbytes) name\n" - "#endif\n" - "#define _NAME_EXTERN(name, stackbytes) name\n" - "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n", - libname); -} - -int -OutputLine_pdef(FILE *fileDest, EXPORT *exp) -{ - fprintf(fileDest, "_NAME(%.*s,%s,%d)", - exp->nNameLength, exp->pcName, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); - - if (exp->pcRedirection) - { - fprintf(fileDest, "= _NAME(%.*s,%s,%d)", - exp->nRedirectionLength, exp->pcRedirection, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); } if (exp->nOrdinal != -1) @@ -339,7 +286,6 @@ if (CompareToken(pc, pszArchString)) { included = 1; - break; } /* Skip to next arch or end */

1 0

[tkreuzer] 49649: [RTL] Add stubs for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 23:51:02 2010 New Revision: 49649 URL: http://svn.reactos.org/svn/reactos?rev=49649&view=rev Log: [RTL] Add stubs for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler Modified: branches/cmake-bringup/lib/rtl/vectoreh.c Modified: branches/cmake-bringup/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/vectoreh.… ============================================================================== --- branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] Fri Nov 19 23:51:02 2010 @@ -190,4 +190,23 @@ return Ret; } +PVOID +NTAPI +RtlAddVectoredContinueHandler( + IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + IN PVOID VectoredHandlerHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */

1 0

[tkreuzer] 49648: [KERNEL32] Switch to new asm syntax Add dependency to asm
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 23:40:01 2010 New Revision: 49648 URL: http://svn.reactos.org/svn/reactos?rev=49648&view=rev Log: [KERNEL32] Switch to new asm syntax Add dependency to asm Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -119,6 +119,6 @@ add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) -add_dependencies(kernel32 errcodes) +add_dependencies(kernel32 errcodes asm) add_cab_target(kernel32 1) add_importlib_target(kernel32.spec) Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -7,11 +7,13 @@ * KJK::Hyperion <noog(a)libero.it> */ -#include <ndk/asm.h> +#include <asm.inc> -.globl SwitchToFiber -.intel_syntax noprefix + +PUBLIC SwitchToFiber SwitchToFiber: /* FIXME: TODO */ ret 4 + +END Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -6,9 +6,11 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -.globl BaseThreadStartupThunk -.globl BaseProcessStartThunk -.intel_syntax noprefix +#include <asm.inc> + + +PUBLIC BaseThreadStartupThunk +PUBLIC BaseProcessStartThunk BaseThreadStartupThunk: @@ -29,4 +31,5 @@ push 0 /* Return RIP */ jmp BaseProcessStartup +END /* EOF */ Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -7,11 +7,12 @@ * KJK::Hyperion <noog(a)libero.it> */ -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> -.globl _SwitchToFiber@4 -.intel_syntax noprefix +.code +PUBLIC _SwitchToFiber@4 _SwitchToFiber@4: /* Get the TEB */ mov edx, fs:[TEB_SELF] @@ -30,7 +31,7 @@ mov [eax+FIBER_CONTEXT_EIP], ebx /* Check if we're to save FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT jnz NoFpuStateSave /* Save the FPU State (Status and Control)*/ @@ -80,7 +81,7 @@ mov [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER], esi /* Restore FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT jnz NoFpuStateRestore /* Check if the Status Word Changed */ @@ -96,7 +97,7 @@ StatusWordChanged: /* Load the new one */ - mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], 0xFFFF + mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(0FFFF) fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] ControlWordEqual: @@ -120,6 +121,7 @@ mov [edx+TEB_FLS_DATA], eax /* Jump to new fiber */ - jmp [ecx+FIBER_CONTEXT_EIP] + jmp dword ptr [ecx+FIBER_CONTEXT_EIP] +END /* EOF */ Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -6,9 +6,15 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -.globl _BaseThreadStartupThunk@0 -.globl _BaseProcessStartThunk@0 -.intel_syntax noprefix +#include <asm.inc> + +.code + +EXTERN _BaseThreadStartup@8:PROC +EXTERN _BaseProcessStartup@4:PROC + +PUBLIC _BaseThreadStartupThunk@0 +PUBLIC _BaseProcessStartThunk@0 _BaseThreadStartupThunk@0: @@ -29,4 +35,5 @@ push 0 /* Return EIP */ jmp _BaseProcessStartup@4 +END /* EOF */

1 0

[tkreuzer] 49647: [ASM] Add more constants for ks386.inc
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 23:16:50 2010 New Revision: 49647 URL: http://svn.reactos.org/svn/reactos?rev=49647&view=rev Log: [ASM] Add more constants for ks386.inc Modified: branches/cmake-bringup/include/asm/genincdata.c branches/cmake-bringup/include/asm/ks386.template.h Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Fri Nov 19 23:16:50 2010 @@ -14,6 +14,21 @@ #include <windbgkd.h> #include <wdbgexts.h> #include <kddll.h> + +// FIXME: where to put this? +typedef struct _FIBER /* Field offsets: */ +{ /* 32 bit 64 bit */ + /* this must be the first field */ + PVOID Parameter; /* 0x00 0x00 */ + struct _EXCEPTION_REGISTRATION_RECORD * ExceptionList; /* 0x04 0x08 */ + PVOID StackBase; /* 0x08 0x10 */ + PVOID StackLimit; /* 0x0C 0x18 */ + PVOID DeallocationStack; /* 0x10 0x20 */ + CONTEXT Context; /* 0x14 0x28 */ + ULONG GuaranteedStackBytes; /* 0x2E0 */ + PVOID FlsData; /* 0x2E4 */ + PVOID ActivationContextStack; /* 0x2E8 */ +} FIBER, *PFIBER; typedef struct { Modified: branches/cmake-bringup/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ks386… ============================================================================== --- branches/cmake-bringup/include/asm/ks386.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ks386.template.h [iso-8859-1] Fri Nov 19 23:16:50 2010 @@ -349,6 +349,31 @@ //OFFSET(CONTEXT_FRAME_LENGTH 0x2D0 SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), +HEADER("FIBER"), +OFFSET(FIBER_PARAMETER, FIBER, Parameter), +OFFSET(FIBER_EXCEPTION_LIST, FIBER, ExceptionList), +OFFSET(FIBER_STACK_BASE, FIBER, StackBase), +OFFSET(FIBER_STACK_LIMIT, FIBER, StackLimit), +OFFSET(FIBER_DEALLOCATION_STACK, FIBER, DeallocationStack), +OFFSET(FIBER_CONTEXT, FIBER, Context), +OFFSET(FIBER_CONTEXT_FLAGS, FIBER, Context.ContextFlags), +OFFSET(FIBER_CONTEXT_EAX, FIBER, Context.Eax), +OFFSET(FIBER_CONTEXT_EBX, FIBER, Context.Ebx), +OFFSET(FIBER_CONTEXT_ECX, FIBER, Context.Ecx), +OFFSET(FIBER_CONTEXT_EDX, FIBER, Context.Edx), +OFFSET(FIBER_CONTEXT_ESI, FIBER, Context.Esi), +OFFSET(FIBER_CONTEXT_EDI, FIBER, Context.Edi), +OFFSET(FIBER_CONTEXT_EBP, FIBER, Context.Ebp), +OFFSET(FIBER_CONTEXT_EIP, FIBER, Context.Eip), +OFFSET(FIBER_CONTEXT_ESP, FIBER, Context.Esp), +OFFSET(FIBER_CONTEXT_DR6, FIBER, Context.Dr6), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD, FIBER, Context.FloatSave.ControlWord), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD, FIBER, Context.FloatSave.StatusWord), +OFFSET(FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD, FIBER, Context.FloatSave.TagWord), +OFFSET(FIBER_GUARANTEED_STACK_BYTES, FIBER, GuaranteedStackBytes), +OFFSET(FIBER_FLS_DATA, FIBER, FlsData), +OFFSET(FIBER_ACTIVATION_CONTEXT_STACK, FIBER, ActivationContextStack), + HEADER("KTSS"), OFFSET(KTSS_IOMAPBASE, KTSS, IoMapBase), OFFSET(KTSS_ESP0, KTSS, Esp0), @@ -406,6 +431,20 @@ //OFFSET(KPROCESS_ACTIVE_PROCESSORS 0x34 //OFFSET(EPROCESS_VDM_OBJECTS 0x144 +HEADER("Teb"), +OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), +OFFSET(TEB_STACK_LIMIT, TEB, NtTib.StackLimit), +OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), +OFFSET(TEB_SELF, TEB, NtTib.Self), +OFFSET(TEB_FIBER_DATA, TEB, NtTib.FiberData), +OFFSET(TEB_PEB, TEB, ProcessEnvironmentBlock), +OFFSET(TEB_EXCEPTION_CODE, TEB, ExceptionCode), +OFFSET(PEB_KERNEL_CALLBACK_TABLE, PEB, KernelCallbackTable), +OFFSET(TEB_FLS_DATA, TEB, FlsData), +OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, ActivationContextStackPointer), +OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), +OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), + HEADER("Misc"), CONSTANT(NPX_FRAME_LENGTH), CONSTANT(FN_CR0_NPX_STATE), @@ -419,18 +458,11 @@ CONSTANT(CBSTACK_TRAP_FRAME), CONSTANT(CBSTACK_CALLBACK_STACK), SIZE(SIZEOF_FX_SAVE_AREA, FX_SAVE_AREA), -OFFSET(TEB_EXCEPTION_LIST, TEB, NtTib.ExceptionList), -OFFSET(TEB_STACK_LIMIT, TEB, NtTib.StackLimit), -OFFSET(TEB_STACK_BASE, TEB, NtTib.StackBase), -OFFSET(TEB_PEB, TEB, ProcessEnvironmentBlock), -OFFSET(TEB_EXCEPTION_CODE, TEB, ExceptionCode), -OFFSET(PEB_KERNEL_CALLBACK_TABLE, PEB, KernelCallbackTable), CONSTANT(KUSER_SHARED_SYSCALL), CONSTANT(EXCEPTION_EXECUTE_HANDLER), CONSTANT(STATUS_CALLBACK_POP_STACK), CONSTANT(CONTEXT_ALIGNED_SIZE), - - - - - +CONSTANT(PROCESSOR_FEATURE_FXSR), + + +

1 0

[ekohl] 49646: [NPFS] - Rename DEVICE_EXTENSION to NPFS_VCB. - Add a type variable to distinguish FCBs and CCBs for device, directory or pipe. - Attach an FCB to the VCB that represents the root di...
by ekohl＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: ekohl Date: Fri Nov 19 22:42:53 2010 New Revision: 49646 URL: http://svn.reactos.org/svn/reactos?rev=49646&view=rev Log: [NPFS] - Rename DEVICE_EXTENSION to NPFS_VCB. - Add a type variable to distinguish FCBs and CCBs for device, directory or pipe. - Attach an FCB to the VCB that represents the root directory of the file system and implement an open routine for the root directory. - Make NpfsWaitPipe work when it is called for the root directory. [KERNEL32] - Remove the old version of WaitNamedPipeW. This patch fixes the broken wait pipe code. It was written and tested on r49458 because later revisions do not work for me. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -14,7 +14,7 @@ #include <debug.h> DEBUG_CHANNEL(kernel32file); -//#define USING_PROPER_NPFS_WAIT_SEMANTICS +#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS ****************************************************************/ @@ -265,16 +265,6 @@ /* - * When NPFS will work properly, use this code instead. It is compatible with - * Microsoft's NPFS.SYS. The main difference is that: - * - This code actually respects the timeout instead of ignoring it! - * - This code validates and creates the proper names for both UNC and local pipes - * - On NT, you open the *root* pipe directory (either \DosDevices\Pipe or - * \DosDevices\Unc\Server\Pipe) and then send the pipe to wait on in the - * FILE_PIPE_WAIT_FOR_BUFFER structure. - */ -#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS -/* * @implemented */ BOOL @@ -458,95 +448,6 @@ /* Success */ return TRUE; } -#else -/* - * @implemented - */ -BOOL -WINAPI -WaitNamedPipeW(LPCWSTR lpNamedPipeName, - DWORD nTimeOut) -{ - UNICODE_STRING NamedPipeName; - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_PIPE_WAIT_FOR_BUFFER WaitPipe; - HANDLE FileHandle; - IO_STATUS_BLOCK Iosb; - - if (RtlDosPathNameToNtPathName_U(lpNamedPipeName, - &NamedPipeName, - NULL, - NULL) == FALSE) - { - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NamedPipeName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, - &ObjectAttributes, - &Iosb, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - RtlFreeUnicodeString(&NamedPipeName); - return FALSE; - } - - /* Check what timeout we got */ - if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) - { - /* Don't use a timeout */ - WaitPipe.TimeoutSpecified = FALSE; - } - else - { - /* Check if we should wait forever */ - if (nTimeOut == NMPWAIT_WAIT_FOREVER) - { - /* Set the max */ - WaitPipe.Timeout.LowPart = 0; - WaitPipe.Timeout.HighPart = 0x80000000; - } - else - { - /* Convert to NT format */ - WaitPipe.Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); - } - - /* In both cases, we do have a timeout */ - WaitPipe.TimeoutSpecified = TRUE; - } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_WAIT, - &WaitPipe, - sizeof(WaitPipe), - NULL, - 0); - NtClose(FileHandle); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - RtlFreeUnicodeString(&NamedPipeName); - return FALSE; - } - - RtlFreeUnicodeString(&NamedPipeName); - return TRUE; -} -#endif /* Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -15,15 +15,15 @@ /* FUNCTIONS *****************************************************************/ -static PNPFS_FCB -NpfsFindPipe(PNPFS_DEVICE_EXTENSION DeviceExt, +PNPFS_FCB +NpfsFindPipe(PNPFS_VCB Vcb, PUNICODE_STRING PipeName) { PLIST_ENTRY CurrentEntry; PNPFS_FCB Fcb; - CurrentEntry = DeviceExt->PipeListHead.Flink; - while (CurrentEntry != &DeviceExt->PipeListHead) + CurrentEntry = Vcb->PipeListHead.Flink; + while (CurrentEntry != &Vcb->PipeListHead) { Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, PipeListEntry); if (RtlCompareUnicodeString(PipeName, @@ -103,53 +103,95 @@ } +static VOID +NpfsOpenRootDirectory(PNPFS_FCB Fcb, + PFILE_OBJECT FileObject, + PIO_STATUS_BLOCK IoStatus) +{ + PNPFS_CCB Ccb; + + DPRINT("NpfsOpenRootDirectory()\n"); + + Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + if (Ccb == NULL) + { + IoStatus->Status = STATUS_NO_MEMORY; + return; + } + + Ccb->Type = CCB_DIRECTORY; + Ccb->Fcb = Fcb; + + FileObject->FsContext = Fcb; + FileObject->FsContext2 = Ccb; + + IoStatus->Information = FILE_OPENED; + IoStatus->Status = STATUS_SUCCESS; + + return; +} + + NTSTATUS NTAPI NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { PEXTENDED_IO_STACK_LOCATION IoStack; + PUNICODE_STRING FileName; PFILE_OBJECT FileObject; + PFILE_OBJECT RelatedFileObject; PNPFS_FCB Fcb; PNPFS_CCB ClientCcb; PNPFS_CCB ServerCcb = NULL; - PNPFS_DEVICE_EXTENSION DeviceExt; - BOOLEAN SpecialAccess; + PNPFS_VCB Vcb; ACCESS_MASK DesiredAccess; + NTSTATUS Status; DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; + RelatedFileObject = FileObject->RelatedFileObject; + FileName = &FileObject->FileName; DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; + DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); Irp->IoStatus.Information = 0; - SpecialAccess = ((DesiredAccess & SPECIFIC_RIGHTS_ALL) == FILE_READ_ATTRIBUTES); - if (SpecialAccess) - { - DPRINT("NpfsCreate() open client end for special use!\n"); - } + if (FileName->Length == 2 && FileName->Buffer[0] == L'\\' && RelatedFileObject == NULL) + { + DPRINT("Open the root directory\n"); + + NpfsOpenRootDirectory(Vcb->RootFcb, + FileObject, + &Irp->IoStatus); + + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + /* * Step 1. Find the pipe we're trying to open. */ - KeLockMutex(&DeviceExt->PipeListLock); - Fcb = NpfsFindPipe(DeviceExt, + KeLockMutex(&Vcb->PipeListLock); + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb == NULL) { /* Not found, bail out with error. */ DPRINT("No pipe found!\n"); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_OBJECT_NAME_NOT_FOUND; } - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); /* * Acquire the lock for CCB lists. From now on no modifications to the @@ -170,11 +212,13 @@ return STATUS_NO_MEMORY; } + ClientCcb->Type = CCB_PIPE; ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; ClientCcb->Fcb = Fcb; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; ClientCcb->OtherSide = NULL; - ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; +// ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; + ClientCcb->PipeState = FILE_PIPE_DISCONNECTED_STATE; InitializeListHead(&ClientCcb->ReadRequestListHead); DPRINT("CCB: %p\n", ClientCcb); @@ -212,9 +256,10 @@ /* * Step 3. Search for listening server CCB. */ - +/* if (!SpecialAccess) { +*/ /* * WARNING: Point of no return! Once we get the server CCB it's * possible that we completed a wait request and so we have to @@ -270,6 +315,7 @@ /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ NpfsSignalAndRemoveListeningServerInstance(Fcb, ServerCcb); } +/* } else if (IsListEmpty(&Fcb->ServerCcbListHead)) { @@ -287,6 +333,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } +*/ /* * Step 4. Add the client CCB to a list and connect it if possible. @@ -326,7 +373,7 @@ { PEXTENDED_IO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; - PNPFS_DEVICE_EXTENSION DeviceExt; + PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; PNAMED_PIPE_CREATE_PARAMETERS Buffer; @@ -334,7 +381,7 @@ DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; DPRINT("FileObject %p\n", FileObject); @@ -360,13 +407,14 @@ return STATUS_NO_MEMORY; } + Ccb->Type = CCB_PIPE; Ccb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; - KeLockMutex(&DeviceExt->PipeListLock); + KeLockMutex(&Vcb->PipeListLock); /* * First search for existing Pipe with the same name. */ - Fcb = NpfsFindPipe(DeviceExt, + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb != NULL) { @@ -374,7 +422,7 @@ * Found Pipe with the same name. Check if we are * allowed to use it. */ - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { @@ -402,7 +450,7 @@ Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); if (Fcb == NULL) { - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; @@ -410,12 +458,14 @@ return STATUS_NO_MEMORY; } + Fcb->Type = FCB_PIPE; + Fcb->Vcb = Vcb; Fcb->PipeName.Length = FileObject->FileName.Length; Fcb->PipeName.MaximumLength = Fcb->PipeName.Length + sizeof(UNICODE_NULL); Fcb->PipeName.Buffer = ExAllocatePool(NonPagedPool, Fcb->PipeName.MaximumLength); if (Fcb->PipeName.Buffer == NULL) { - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); ExFreePool(Fcb); ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -457,18 +507,18 @@ { if (Buffer->InboundQuota == 0) { - Fcb->InboundQuota = DeviceExt->DefaultQuota; + Fcb->InboundQuota = Vcb->DefaultQuota; } else { Fcb->InboundQuota = PAGE_ROUND_UP(Buffer->InboundQuota); - if (Fcb->InboundQuota < DeviceExt->MinQuota) + if (Fcb->InboundQuota < Vcb->MinQuota) { - Fcb->InboundQuota = DeviceExt->MinQuota; + Fcb->InboundQuota = Vcb->MinQuota; } - else if (Fcb->InboundQuota > DeviceExt->MaxQuota) + else if (Fcb->InboundQuota > Vcb->MaxQuota) { - Fcb->InboundQuota = DeviceExt->MaxQuota; + Fcb->InboundQuota = Vcb->MaxQuota; } } } @@ -481,18 +531,18 @@ { if (Buffer->OutboundQuota == 0) { - Fcb->OutboundQuota = DeviceExt->DefaultQuota; + Fcb->OutboundQuota = Vcb->DefaultQuota; } else { Fcb->OutboundQuota = PAGE_ROUND_UP(Buffer->OutboundQuota); - if (Fcb->OutboundQuota < DeviceExt->MinQuota) + if (Fcb->OutboundQuota < Vcb->MinQuota) { - Fcb->OutboundQuota = DeviceExt->MinQuota; + Fcb->OutboundQuota = Vcb->MinQuota; } - else if (Fcb->OutboundQuota > DeviceExt->MaxQuota) + else if (Fcb->OutboundQuota > Vcb->MaxQuota) { - Fcb->OutboundQuota = DeviceExt->MaxQuota; + Fcb->OutboundQuota = Vcb->MaxQuota; } } } @@ -501,8 +551,8 @@ Fcb->OutboundQuota = 0; } - InsertTailList(&DeviceExt->PipeListHead, &Fcb->PipeListEntry); - KeUnlockMutex(&DeviceExt->PipeListLock); + InsertTailList(&Vcb->PipeListHead, &Fcb->PipeListEntry); + KeUnlockMutex(&Vcb->PipeListLock); } if (Fcb->InboundQuota) @@ -514,9 +564,9 @@ if (NewPipe) { - KeLockMutex(&DeviceExt->PipeListLock); + KeLockMutex(&Vcb->PipeListLock); RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); RtlFreeUnicodeString(&Fcb->PipeName); ExFreePool(Fcb); } @@ -573,7 +623,7 @@ NpfsCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PNPFS_DEVICE_EXTENSION DeviceExt; + PNPFS_VCB Vcb; PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_CCB Ccb, OtherSide; @@ -583,13 +633,22 @@ DPRINT("NpfsCleanup(DeviceObject %p Irp %p)\n", DeviceObject, Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = FileObject->FsContext2; if (Ccb == NULL) { DPRINT("Success!\n"); + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + if (Ccb->Type == CCB_DIRECTORY) + { + DPRINT("Cleanup the root directory!\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -708,9 +767,9 @@ NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; + PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; BOOLEAN Server; @@ -718,7 +777,7 @@ DPRINT("NpfsClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp); IoStack = IoGetCurrentIrpStackLocation(Irp); - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = FileObject->FsContext2; @@ -731,6 +790,20 @@ return STATUS_SUCCESS; } + if (Ccb->Type == CCB_DIRECTORY) + { + DPRINT("Closing the root directory!\n"); + + ExFreePool(Ccb); + FileObject->FsContext = NULL; + FileObject->FsContext2 = NULL; + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + DPRINT("CCB %p\n", Ccb); Fcb = Ccb->Fcb; @@ -771,9 +844,9 @@ IsListEmpty(&Fcb->ClientCcbListHead)) { RtlFreeUnicodeString(&Fcb->PipeName); - KeLockMutex(&DeviceExt->PipeListLock); + KeLockMutex(&Vcb->PipeListLock); RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); ExFreePool(Fcb); FileObject->FsContext = NULL; } Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -214,7 +214,7 @@ PIO_STACK_LOCATION IoStack; FILE_INFORMATION_CLASS FileInformationClass; PFILE_OBJECT FileObject; - PNPFS_DEVICE_EXTENSION DeviceExtension; + PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; PVOID SystemBuffer; @@ -225,7 +225,7 @@ IoStack = IoGetCurrentIrpStackLocation (Irp); FileInformationClass = IoStack->Parameters.QueryFile.FileInformationClass; - DeviceExtension = DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Ccb = (PNPFS_CCB)FileObject->FsContext2; Fcb = Ccb->Fcb; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -293,22 +293,65 @@ PNPFS_CCB Ccb) { PLIST_ENTRY current_entry; + PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB ServerCcb; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; + LARGE_INTEGER TimeOut; + UNICODE_STRING PipeName; NTSTATUS Status; - LARGE_INTEGER TimeOut; DPRINT("NpfsWaitPipe\n"); WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; - Fcb = Ccb->Fcb; - - if (Ccb->PipeState != 0) - { - DPRINT("Pipe is not in passive (waiting) state!\n"); - return STATUS_UNSUCCESSFUL; - } + + /* Fail, if the CCB does not represent the root directory */ + if (Ccb->Type != CCB_DIRECTORY) + return STATUS_ILLEGAL_FUNCTION; + + /* Calculate the pipe name length and allocate the buffer */ + PipeName.Length = WaitPipe->NameLength + sizeof(WCHAR); + PipeName.MaximumLength = PipeName.Length + sizeof(WCHAR); + PipeName.Buffer = ExAllocatePool(NonPagedPool, PipeName.MaximumLength); + if (PipeName.Buffer == NULL) + { + DPRINT1("Could not allocate memory for the pipe name!\n"); + return STATUS_NO_MEMORY; + } + + /* Copy the pipe name into the buffer, prepend a backslash and append a 0 character */ + PipeName.Buffer[0] = L'\\'; + RtlCopyMemory(&PipeName.Buffer[1], + &WaitPipe->Name[0], + WaitPipe->NameLength); + PipeName.Buffer[PipeName.Length / sizeof(WCHAR)] = 0; + + DPRINT("Waiting for Pipe %wZ\n", &PipeName); + + /* Get the VCB */ + Vcb = Ccb->Fcb->Vcb; + + /* Lock the pipe list */ + KeLockMutex(&Vcb->PipeListLock); + + /* File a pipe with the given name */ + Fcb = NpfsFindPipe(Vcb, + &PipeName); + + /* Unlock the pipe list */ + KeUnlockMutex(&Vcb->PipeListLock); + + /* Release the pipe name buffer */ + ExFreePool(PipeName.Buffer); + + /* Fail if not pipe was found */ + if (Fcb == NULL) + { + DPRINT("No pipe found!\n", Fcb); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + DPRINT("Fcb %p\n", Fcb); /* search for listening server */ current_entry = Fcb->ServerCcbListHead.Flink; @@ -484,13 +527,13 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; NTSTATUS Status; - PNPFS_DEVICE_EXTENSION DeviceExt; + PNPFS_VCB Vcb; PNPFS_FCB Fcb; PNPFS_CCB Ccb; DPRINT("NpfsFileSystemContol(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("IoStack: %p\n", IoStack); FileObject = IoStack->FileObject; Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -19,9 +19,10 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - PNPFS_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName; + PNPFS_VCB Vcb; + PNPFS_FCB Fcb; NTSTATUS Status; DPRINT("Named Pipe FSD 0.0.2\n"); @@ -56,7 +57,7 @@ RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); Status = IoCreateDevice(DriverObject, - sizeof(NPFS_DEVICE_EXTENSION), + sizeof(NPFS_VCB), &DeviceName, FILE_DEVICE_NAMED_PIPE, 0, @@ -68,21 +69,29 @@ return Status; } - /* initialize the device object */ + /* Initialize the device object */ DeviceObject->Flags |= DO_DIRECT_IO; DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - /* initialize the device extension */ - DeviceExtension = DeviceObject->DeviceExtension; - InitializeListHead(&DeviceExtension->PipeListHead); - InitializeListHead(&DeviceExtension->ThreadListHead); - KeInitializeMutex(&DeviceExtension->PipeListLock, 0); - DeviceExtension->EmptyWaiterCount = 0; + /* Initialize the Volume Control Block (VCB) */ + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; + InitializeListHead(&Vcb->PipeListHead); + InitializeListHead(&Vcb->ThreadListHead); + KeInitializeMutex(&Vcb->PipeListLock, 0); + Vcb->EmptyWaiterCount = 0; /* set the size quotas */ - DeviceExtension->MinQuota = PAGE_SIZE; - DeviceExtension->DefaultQuota = 8 * PAGE_SIZE; - DeviceExtension->MaxQuota = 64 * PAGE_SIZE; + Vcb->MinQuota = PAGE_SIZE; + Vcb->DefaultQuota = 8 * PAGE_SIZE; + Vcb->MaxQuota = 64 * PAGE_SIZE; + + Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb->Type = FCB_DIRECTORY; + Fcb->Vcb = Vcb; + + + + Vcb->RootFcb = Fcb; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -4,7 +4,22 @@ #include <ntifs.h> #include <ndk/iotypes.h> -typedef struct _NPFS_DEVICE_EXTENSION +typedef enum _FCB_TYPE +{ + FCB_DEVICE, + FCB_DIRECTORY, + FCB_PIPE +} FCB_TYPE; + +typedef enum _CCB_TYPE +{ + CCB_DEVICE, + CCB_DIRECTORY, + CCB_PIPE +} CCB_TYPE; + +/* Volume Control Block (VCB) aka Device Extension */ +typedef struct _NPFS_VCB { LIST_ENTRY PipeListHead; LIST_ENTRY ThreadListHead; @@ -13,11 +28,13 @@ ULONG MinQuota; ULONG DefaultQuota; ULONG MaxQuota; -} NPFS_DEVICE_EXTENSION, *PNPFS_DEVICE_EXTENSION; + struct _NPFS_FCB *RootFcb; +} NPFS_VCB, *PNPFS_VCB; typedef struct _NPFS_FCB { - FSRTL_COMMON_FCB_HEADER RFCB; + FCB_TYPE Type; + PNPFS_VCB Vcb; UNICODE_STRING PipeName; LIST_ENTRY PipeListEntry; KMUTEX CcbListLock; @@ -40,9 +57,11 @@ typedef struct _NPFS_CCB { LIST_ENTRY CcbListEntry; + CCB_TYPE Type; + PNPFS_FCB Fcb; + struct _NPFS_CCB* OtherSide; struct ETHREAD *Thread; - PNPFS_FCB Fcb; KEVENT ConnectEvent; KEVENT ReadEvent; KEVENT WriteEvent; @@ -71,7 +90,7 @@ { ULONG Count; KEVENT Event; - PNPFS_DEVICE_EXTENSION DeviceExt; + PNPFS_VCB Vcb; LIST_ENTRY ListEntry; PVOID WaitObjectArray[MAXIMUM_WAIT_OBJECTS]; KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS]; @@ -135,4 +154,9 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +PNPFS_FCB +NpfsFindPipe(PNPFS_VCB Vcb, + PUNICODE_STRING PipeName); + + #endif /* __DRIVERS_FS_NP_NPFS_H */ Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Nov 19 22:42:53 2010 @@ -48,8 +48,8 @@ IN PIRP Irp) { PNPFS_CONTEXT Context; - PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; + PNPFS_VCB Vcb; PNPFS_CCB Ccb; PLIST_ENTRY ListEntry; PNPFS_THREAD_CONTEXT ThreadContext; @@ -60,17 +60,17 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); Ccb = IoStack->FileObject->FsContext2; - KeLockMutex(&DeviceExt->PipeListLock); + KeLockMutex(&Vcb->PipeListLock); ExAcquireFastMutex(&Ccb->DataListLock); switch(IoStack->MajorFunction) { case IRP_MJ_READ: - ListEntry = DeviceExt->ThreadListHead.Flink; - while (ListEntry != &DeviceExt->ThreadListHead) + ListEntry = Vcb->ThreadListHead.Flink; + while (ListEntry != &Vcb->ThreadListHead) { ThreadContext = CONTAINING_RECORD(ListEntry, NPFS_THREAD_CONTEXT, ListEntry); /* Real events start at index 1 */ @@ -92,7 +92,7 @@ KeSetEvent(&ThreadContext->Event, IO_NO_INCREMENT, FALSE); ExReleaseFastMutex(&Ccb->DataListLock); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); return; } @@ -103,7 +103,7 @@ RemoveEntryList(&Context->ListEntry); ExReleaseFastMutex(&Ccb->DataListLock); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; @@ -126,12 +126,12 @@ PIO_STACK_LOCATION IoStack = NULL; KIRQL OldIrql; - KeLockMutex(&ThreadContext->DeviceExt->PipeListLock); + KeLockMutex(&ThreadContext->Vcb->PipeListLock); while (1) { CurrentCount = ThreadContext->Count; - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); + KeUnlockMutex(&ThreadContext->Vcb->PipeListLock); IoAcquireCancelSpinLock(&OldIrql); if (Irp && IoSetCancelRoutine(Irp, NULL) != NULL) { @@ -162,14 +162,14 @@ { ASSERT(FALSE); } - KeLockMutex(&ThreadContext->DeviceExt->PipeListLock); + KeLockMutex(&ThreadContext->Vcb->PipeListLock); Count = Status - STATUS_WAIT_0; ASSERT (Count < CurrentCount); if (Count > 0) { Irp = ThreadContext->WaitIrpArray[Count]; ThreadContext->Count--; - ThreadContext->DeviceExt->EmptyWaiterCount++; + ThreadContext->Vcb->EmptyWaiterCount++; ThreadContext->WaitObjectArray[Count] = ThreadContext->WaitObjectArray[ThreadContext->Count]; ThreadContext->WaitIrpArray[Count] = ThreadContext->WaitIrpArray[ThreadContext->Count]; } @@ -184,18 +184,18 @@ if (ThreadContext->WaitIrpArray[i] == NULL) { ThreadContext->Count--; - ThreadContext->DeviceExt->EmptyWaiterCount++; + ThreadContext->Vcb->EmptyWaiterCount++; ThreadContext->WaitObjectArray[i] = ThreadContext->WaitObjectArray[ThreadContext->Count]; ThreadContext->WaitIrpArray[i] = ThreadContext->WaitIrpArray[ThreadContext->Count]; } } } - if (ThreadContext->Count == 1 && ThreadContext->DeviceExt->EmptyWaiterCount >= MAXIMUM_WAIT_OBJECTS) + if (ThreadContext->Count == 1 && ThreadContext->Vcb->EmptyWaiterCount >= MAXIMUM_WAIT_OBJECTS) { /* it exist an other thread with empty wait slots, we can remove our thread from the list */ RemoveEntryList(&ThreadContext->ListEntry); - ThreadContext->DeviceExt->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1; - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); + ThreadContext->Vcb->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1; + KeUnlockMutex(&ThreadContext->Vcb->PipeListLock); break; } } @@ -208,19 +208,21 @@ { PLIST_ENTRY ListEntry; PNPFS_THREAD_CONTEXT ThreadContext = NULL; + PNPFS_CONTEXT Context; + HANDLE hThread; + PNPFS_VCB Vcb; + KIRQL oldIrql; NTSTATUS Status; - HANDLE hThread; - KIRQL oldIrql; - - PNPFS_CONTEXT Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - PNPFS_DEVICE_EXTENSION DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; + Vcb = (PNPFS_VCB)DeviceObject->DeviceExtension; DPRINT("NpfsAddWaitingReadWriteRequest(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); - KeLockMutex(&DeviceExt->PipeListLock); - - ListEntry = DeviceExt->ThreadListHead.Flink; - while (ListEntry != &DeviceExt->ThreadListHead) + KeLockMutex(&Vcb->PipeListLock); + + ListEntry = Vcb->ThreadListHead.Flink; + while (ListEntry != &Vcb->ThreadListHead) { ThreadContext = CONTAINING_RECORD(ListEntry, NPFS_THREAD_CONTEXT, ListEntry); if (ThreadContext->Count < MAXIMUM_WAIT_OBJECTS) @@ -229,19 +231,20 @@ } ListEntry = ListEntry->Flink; } - if (ListEntry == &DeviceExt->ThreadListHead) + + if (ListEntry == &Vcb->ThreadListHead) { ThreadContext = ExAllocatePool(NonPagedPool, sizeof(NPFS_THREAD_CONTEXT)); if (ThreadContext == NULL) { - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); return STATUS_NO_MEMORY; } - ThreadContext->DeviceExt = DeviceExt; + + ThreadContext->Vcb = Vcb; KeInitializeEvent(&ThreadContext->Event, SynchronizationEvent, FALSE); ThreadContext->Count = 1; ThreadContext->WaitObjectArray[0] = &ThreadContext->Event; - DPRINT("Creating a new system thread for waiting read/write requests\n"); @@ -255,11 +258,12 @@ if (!NT_SUCCESS(Status)) { ExFreePool(ThreadContext); - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); return Status; } - InsertHeadList(&DeviceExt->ThreadListHead, &ThreadContext->ListEntry); - DeviceExt->EmptyWaiterCount += MAXIMUM_WAIT_OBJECTS - 1; + + InsertHeadList(&Vcb->ThreadListHead, &ThreadContext->ListEntry); + Vcb->EmptyWaiterCount += MAXIMUM_WAIT_OBJECTS - 1; } IoMarkIrpPending(Irp); @@ -276,11 +280,11 @@ ThreadContext->WaitObjectArray[ThreadContext->Count] = Context->WaitEvent; ThreadContext->WaitIrpArray[ThreadContext->Count] = Irp; ThreadContext->Count++; - DeviceExt->EmptyWaiterCount--; + Vcb->EmptyWaiterCount--; KeSetEvent(&ThreadContext->Event, IO_NO_INCREMENT, FALSE); Status = STATUS_SUCCESS; } - KeUnlockMutex(&DeviceExt->PipeListLock); + KeUnlockMutex(&Vcb->PipeListLock); return Status; }

1 0

[tkreuzer] 49645: [CMAKE] - Add asm dependencies to freeldr, ntdll, crt - Add importlib for hal and ntoskrnl - Fix ntoskrnl spec file - Fix resource pathes in ntoskrnl.rc
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 22:02:33 2010 New Revision: 49645 URL: http://svn.reactos.org/svn/reactos?rev=49645&view=rev Log: [CMAKE] - Add asm dependencies to freeldr, ntdll, crt - Add importlib for hal and ntoskrnl - Fix ntoskrnl spec file - Fix resource pathes in ntoskrnl.rc Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/ntoskrnl.rc branches/cmake-bringup/ntoskrnl/ntoskrnl.spec Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -200,7 +200,7 @@ rtl libcntpr) add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) -add_dependencies(freeldr ks386) +add_dependencies(freeldr asm) list(APPEND SETUPLDR_SOURCE ${FREELDR_STARTUP_SOURCE} @@ -232,7 +232,7 @@ rtl libcntpr) -add_dependencies(setupldr ks386) +add_dependencies(setupldr asm) # Bootcd files add_minicd_target(setupldr loader setupldr.sys) Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -51,7 +51,7 @@ ${PSEH_LIB}) add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) -add_dependencies(ntdll ntstatus) +add_dependencies(ntdll ntstatus asm) add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -104,4 +104,6 @@ add_livecd_target(hal reactos/system32) else() #TBD -endif(ARCH MATCHES i386) +endif(ARCH MATCHES i386) + +add_importlib_target(hal.spec) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -413,7 +413,7 @@ set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) -add_dependencies(crt psdk buildno_header ks386) +add_dependencies(crt psdk buildno_header asm) list(APPEND LIBCNTPR_SOURCE except/${ARCH}/chkstk_asm.s Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -426,7 +426,8 @@ add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE) -add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi) +add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi asm) add_minicd_target(ntoskrnl reactos ntoskrnl.exe) -add_livecd_target(ntoskrnl reactos/system32) +add_livecd_target(ntoskrnl reactos/system32) +add_importlib_target(ntoskrnl.spec) Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ntoskrnl.rc [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -23,20 +23,20 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" -#include "resource.h" +#include "include/resource.h" // // Bug Codes and Bitmaps // #include "bugcodes.rc" -IDB_BOOT_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" -IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" -IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" -IDB_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_LOGO_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" -IDB_LOGO_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" -IDB_BAR_PRO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" -IDB_SERVER_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" +IDB_BOOT_LOGO BITMAP DISCARDABLE "inbv/logo/1.bmp" +IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "inbv/logo/2.bmp" +IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP DISCARDABLE "inbv/logo/4.bmp" +IDB_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_LOGO_HEADER BITMAP DISCARDABLE "inbv/logo/6.bmp" +IDB_LOGO_BAND BITMAP DISCARDABLE "inbv/logo/7.bmp" +IDB_BAR_PRO BITMAP DISCARDABLE "inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP DISCARDABLE "inbv/logo/14.bmp" +IDB_SERVER_BAND BITMAP DISCARDABLE "inbv/logo/15.bmp" Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -700,7 +700,7 @@ @ fastcall KefAcquireSpinLockAtDpcLevel(ptr) @ fastcall KefReleaseSpinLockFromDpcLevel(ptr) @ stdcall -arch=i386 Kei386EoiHelper() -@ fastcall -arch=i386 KiEoiHelper(ptr) /* FIXME: Evaluate decision */ +@ fastcall -arch=i386 KiEoiHelper(ptr) @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery()

1 0

[tkreuzer] 49644: [NCI] fix win32k stubs
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 19:44:05 2010 New Revision: 49644 URL: http://svn.reactos.org/svn/reactos?rev=49644&view=rev Log: [NCI] fix win32k stubs Modified: branches/cmake-bringup/tools/nci/ncitool.c Modified: branches/cmake-bringup/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/ncitool… ============================================================================== --- branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] Fri Nov 19 19:44:05 2010 @@ -703,6 +703,9 @@ WriteFileHeader(Files[Win32kStubs], "System Call Stubs for Native API", argv[Win32kStubs + ArgOffset]); + fputs("#include <asm.inc>\n" + "#include <ks386.inc>\n" + ".code\n\n", Files[Win32kStubs]); /* Create the System Stubs */ CreateStubs(Files[NativeSystemDb],

1 0

[tkreuzer] 49643: [CRT] Remove unneccessary prototypes
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 18:57:51 2010 New Revision: 49643 URL: http://svn.reactos.org/svn/reactos?rev=49643&view=rev Log: [CRT] Remove unneccessary prototypes Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/file.h Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/file.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/inclu… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/file.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/file.h [iso-8859-1] Fri Nov 19 18:57:51 2010 @@ -127,8 +127,6 @@ int _isnanl(long double x); int _isinfl(long double x); -int _isnan(double x); -int _isinf(double x); /* Flags for the iobuf structure (for reference) */ #if 0

1 0

[tkreuzer] 49642: [CRT] Silence a warning
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 18:56:58 2010 New Revision: 49642 URL: http://svn.reactos.org/svn/reactos?rev=49642&view=rev Log: [CRT] Silence a warning Modified: branches/cmake-bringup/lib/sdk/crt/misc/assert.c Modified: branches/cmake-bringup/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/misc/assert.c [iso-8859-1] Fri Nov 19 18:56:58 2010 @@ -32,7 +32,7 @@ /* Get MessageBoxA function pointer */ hmodUser32 = LoadLibrary("user32.dll"); - pMessageBoxA = GetProcAddress(hmodUser32, "MessageBoxA"); + pMessageBoxA = (PVOID)GetProcAddress(hmodUser32, "MessageBoxA"); if (!pMessageBoxA) { abort();

1 0

[tkreuzer] 49641: [RTL] Add dependency to asm
by tkreuzer＠svn.reactos.org 19 Nov '10

19 Nov '10

Author: tkreuzer Date: Fri Nov 19 18:55:26 2010 New Revision: 49641 URL: http://svn.reactos.org/svn/reactos?rev=49641&view=rev Log: [RTL] Add dependency to asm Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Nov 19 18:55:26 2010 @@ -100,4 +100,5 @@ add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE}) add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) -add_dependencies(rtl psdk ks386) +add_dependencies(rtl psdk asm) +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs