Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 52549: [KMTESTS] - add a user-mode part to the example testlist.c - misc fixes
by tfaber＠svn.reactos.org 06 Jul '11

06 Jul '11

Author: tfaber Date: Wed Jul 6 18:55:21 2011 New Revision: 52549 URL: http://svn.reactos.org/svn/reactos?rev=52549&view=rev Log: [KMTESTS] - add a user-mode part to the example testlist.c - misc fixes Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -50,6 +50,9 @@ kmtest/service.c kmtest/support.c kmtest/testlist.c + + example/Example_user.c + kmtest/kmtest.rc) add_executable(kmtest ${KMTEST_SOURCE}) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test kernel-mode part + * PURPOSE: Kernel-Mode Test Suite Example kernel-mode test part * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example user-mode test part + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <kmt_test.h> + +START_TEST(Example) +{ + /* do some user-mode stuff */ + SYSTEM_INFO SystemInfo; + + trace("Message from user-mode\n"); + + GetSystemInfo(&SystemInfo); + ok(SystemInfo.dwActiveProcessorMask != 0, "No active processors?!\n"); + + /* now run the kernel-mode part (see Example.c). + * If no user-mode part exists, this is what's done automatically */ + KmtRunKernelTest("Example"); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -46,6 +46,8 @@ PMDL Mdl; } KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; #elif defined KMT_USER_MODE +DWORD KmtRunKernelTest(IN PCSTR TestName); + VOID KmtLoadDriver(IN PCWSTR ServiceName, IN BOOLEAN RestartIfRunning); VOID KmtUnloadDriver(VOID); VOID KmtOpenDriver(VOID); Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -8,4 +8,7 @@ <file>support.c</file> <file>testlist.c</file> </directory> + <directory name="example"> + <file>Example_user.c</file> + </directory> </module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -26,7 +26,7 @@ #define LOGBUFFER_SIZE 65000 #define RESULTBUFFER_SIZE FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]) -static HANDLE KmtestHandle; +HANDLE KmtestHandle; PCSTR ErrorFileAndLine = "No error"; static void OutputError(DWORD Error); @@ -223,15 +223,14 @@ TestFunction(); goto cleanup; } - + // not found in user-mode test list, call driver - if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_RUN_TEST, (PVOID)TestName, strlen(TestName), NULL, 0, &BytesRead, NULL)) - error_goto(Error, cleanup); + Error = KmtRunKernelTest(TestName); cleanup: if (!Error) - OutputResult(TestName); - + Error = OutputResult(TestName); + KmtFreeResultBuffer(ResultBuffer); return Error; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -50,6 +50,31 @@ /* test support functions for special-purpose drivers */ +extern HANDLE KmtestHandle; + +/** + * @name KmtRunKernelTest + * + * Run the specified kernel-mode test part + * + * @param TestName + * Name of the test to run + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtRunKernelTest( + IN PCSTR TestName) +{ + DWORD Error = ERROR_SUCCESS; + DWORD BytesRead; + + if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_RUN_TEST, (PVOID)TestName, strlen(TestName), NULL, 0, &BytesRead, NULL)) + error(Error); + + return Error; +} + static WCHAR TestServiceName[MAX_PATH]; static SC_HANDLE TestServiceHandle; static HANDLE TestDeviceHandle; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Wed Jul 6 18:55:21 2011 @@ -14,6 +14,7 @@ VOID Test_Delete(VOID); VOID Test_Start(VOID); VOID Test_Stop(VOID); +VOID Test_Example(VOID); /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -22,5 +23,6 @@ { "-delete", Test_Delete }, { "-start", Test_Start }, { "-stop", Test_Stop, }, + { "Example", Test_Example }, { NULL, NULL }, };

1 0

[tkreuzer] 52548: [NTOSKRNL] - Fix completely broken code to detect invalid MSR access in KiTrap0DHandler - Fix MSVC warnings
by tkreuzer＠svn.reactos.org 06 Jul '11

06 Jul '11

Author: tkreuzer Date: Wed Jul 6 18:23:04 2011 New Revision: 52548 URL: http://svn.reactos.org/svn/reactos?rev=52548&view=rev Log: [NTOSKRNL] - Fix completely broken code to detect invalid MSR access in KiTrap0DHandler - Fix MSVC warnings Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Wed Jul 6 18:23:04 2011 @@ -42,7 +42,7 @@ 0xEE, /* OUT */ 0xEF, /* OUT */ 0x6E, /* OUTS */ - 0x6F, /* OUTS */ + 0x6F, /* OUTS */ }; PFAST_SYSTEM_CALL_EXIT KiFastCallExitHandler; @@ -143,7 +143,7 @@ KiCommonExit(TrapFrame, 0); /* Restore previous mode */ - KeGetCurrentThread()->PreviousMode = TrapFrame->PreviousPreviousMode; + KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; /* Check for user mode exit */ if (TrapFrame->SegCs & MODE_MASK) @@ -174,7 +174,7 @@ KiCommonExit(TrapFrame, 0); /* Restore previous mode */ - KeGetCurrentThread()->PreviousMode = TrapFrame->PreviousPreviousMode; + KeGetCurrentThread()->PreviousMode = (CCHAR)TrapFrame->PreviousPreviousMode; /* Check if this was a V8086 trap */ if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturnNoSegments(TrapFrame); @@ -213,7 +213,7 @@ Parameter1, Parameter2, Parameter3, - TrapFrame); + TrapFrame); } DECLSPEC_NORETURN @@ -463,7 +463,7 @@ // // Note that in reality, we are already on the NMI tss -- we just need to // update the PCR to reflect this - // + // PCR->TSS = NmiTss; __writeeflags(__readeflags() &~ EFLAGS_NESTED_TASK); TssGdt->HighWord.Bits.Dpl = 0; @@ -527,7 +527,7 @@ // Although the CPU disabled NMIs, we just did a BIOS Call, which could've // totally changed things. // - // We have to make sure we're still in our original NMI -- a nested NMI + // We have to make sure we're still in our original NMI -- a nested NMI // will point back to the NMI TSS, and in that case we're hosed. // if (PCR->TSS->Backlink != KGDT_NMI_TSS) @@ -652,7 +652,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Bring IRQL back */ @@ -910,7 +910,7 @@ { /* Should only happen in VDM mode */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Bring IRQL back */ @@ -933,7 +933,7 @@ /* Enable interrupts and check error code */ _enable(); if (!TrapFrame->ErrCode) - { + { /* FIXME: Use SEH */ Instructions = (PUCHAR)TrapFrame->Eip; @@ -1047,7 +1047,7 @@ TrapFrame); } - /* + /* * Check for a fault during checking of the user instruction. * * Note that the SEH handler will catch invalid EIP, but we could be dealing @@ -1059,7 +1059,7 @@ { /* Not implemented */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* @@ -1100,7 +1100,7 @@ if (Instructions[0] == 0xCF) { /* - * Some evil shit is going on here -- this is not the SS:ESP you're + * Some evil shit is going on here -- this is not the SS:ESP you're * looking for! Instead, this is actually CS:EIP you're looking at! * Why? Because part of the trap frame actually corresponds to the IRET * stack during the trap exit! @@ -1121,8 +1121,8 @@ /* So since we're not dealing with the above case, check for RDMSR/WRMSR */ if ((Instructions[0] == 0xF) && // 2-byte opcode - (((Instructions[1] >> 8) == 0x30) || // RDMSR - ((Instructions[2] >> 8) == 0x32))) // WRMSR + ((Instructions[1] == 0x32) || // RDMSR + (Instructions[1] == 0x30))) // WRMSR { /* Unknown CPU MSR, so raise an access violation */ KiDispatchException0Args(STATUS_ACCESS_VIOLATION, @@ -1211,7 +1211,7 @@ { /* Not yet implemented */ UNIMPLEMENTED; - while (TRUE); + while (TRUE); } /* Check for syscall fault */ @@ -1496,7 +1496,7 @@ /* Save previous mode */ TrapFrame->PreviousPreviousMode = Thread->PreviousMode; - /* Save the SEH chain and terminate it for now */ + /* Save the SEH chain and terminate it for now */ TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END; @@ -1533,7 +1533,7 @@ goto ExitCall; } - /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ + /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ Result = KiConvertToGuiThread(); if (!NT_SUCCESS(Result)) { @@ -1541,7 +1541,7 @@ //SetLastWin32Error(RtlNtStatusToDosError(Result)); goto ExitCall; } - + /* Reload trap frame and descriptor table pointer from new stack */ TrapFrame = *(volatile PVOID*)&Thread->TrapFrame; DescriptorTable = (PVOID)(*(volatile ULONG_PTR*)&Thread->ServiceTable + Offset); Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Jul 6 18:23:04 2011 @@ -452,7 +452,7 @@ PLIST_ENTRY ListHead; PPOOL_HEADER Entry, NextEntry, FragmentEntry; KIRQL OldIrql; - ULONG BlockSize, i; + USHORT BlockSize, i; // // Some sanity checks @@ -495,7 +495,8 @@ // request would've been treated as a POOL_MAX_ALLOC earlier and resulted in // the direct allocation of pages. // - i = (NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) / POOL_BLOCK_SIZE; + i = (USHORT)((NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) + / POOL_BLOCK_SIZE); // // Loop in the free lists looking for a block if this size. Start with the @@ -748,7 +749,7 @@ IN ULONG TagToFree) { PPOOL_HEADER Entry, NextEntry; - ULONG BlockSize; + USHORT BlockSize; KIRQL OldIrql; POOL_TYPE PoolType; PPOOL_DESCRIPTOR PoolDesc;

1 0

[tkreuzer] 52547: [NPFS] Fix 2nd stage pool corruption. CCBs are organized in a linked list in the corresponding Fcb, which is protected by Fcb->CcbListLock. They are also linked together server <-...
by tkreuzer＠svn.reactos.org 06 Jul '11

06 Jul '11

Author: tkreuzer Date: Wed Jul 6 18:14:42 2011 New Revision: 52547 URL: http://svn.reactos.org/svn/reactos?rev=52547&view=rev Log: [NPFS] Fix 2nd stage pool corruption. CCBs are organized in a linked list in the corresponding Fcb, which is protected by Fcb->CcbListLock. They are also linked together server <-> client. This way they can be referenced without holding the lock. This lead to a race condition where a CCB's link was modified after the CCB was deleted. Fix this by using a reference counter and adding appropriate functions. Also make use of pool tags. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/dirctl.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/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] Wed Jul 6 18:14:42 2011 @@ -16,6 +16,76 @@ //#define USING_PROPER_NPFS_WAIT_SEMANTICS /* FUNCTIONS *****************************************************************/ + +static +VOID +NpfsDeleteFcb(PNPFS_FCB Fcb) +{ + PNPFS_VCB Vcb = Fcb->Vcb; + + KeLockMutex(&Vcb->PipeListLock); + RemoveEntryList(&Fcb->PipeListEntry); + KeUnlockMutex(&Vcb->PipeListLock); + RtlFreeUnicodeString(&Fcb->PipeName); + ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); +} + +static +PNPFS_CCB +NpfsAllocateCcb(CCB_TYPE Type, PNPFS_FCB Fcb) +{ + PNPFS_CCB Ccb; + + Ccb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_CCB), TAG_NPFS_CCB); + if (!Ccb) + { + return NULL; + } + + RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); + + Ccb->RefCount = 1; + Ccb->Type = Type; + Ccb->Fcb = Fcb; + Ccb->OtherSide = NULL; + + return Ccb; +} + +static +VOID +NpfsReferenceCcb(PNPFS_CCB Ccb) +{ + ASSERT(Ccb->RefCount > 0); + InterlockedIncrement((PLONG)&Ccb->RefCount); +} + +static +VOID +NpfsDereferenceCcb(PNPFS_CCB Ccb) +{ + /* Decrement reference count */ + ASSERT(Ccb->RefCount > 0); + if (InterlockedDecrement((PLONG)&Ccb->RefCount) == 0) + { + /* Its zero, delete CCB */ + ExFreePoolWithTag(Ccb, TAG_NPFS_CCB); + } +} + +static +VOID +NpfsCcbSetOtherSide(PNPFS_CCB Ccb, PNPFS_CCB OtherSide) +{ + /* Dereference old other side */ + if (Ccb->OtherSide) NpfsDereferenceCcb(Ccb->OtherSide); + + /* Reference the new other side */ + if (OtherSide) NpfsReferenceCcb(OtherSide); + + /* Set new value */ + Ccb->OtherSide = OtherSide; +} PNPFS_FCB NpfsFindPipe(PNPFS_VCB Vcb, @@ -114,17 +184,12 @@ DPRINT("NpfsOpenFileSystem()\n"); - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + Ccb = NpfsAllocateCcb(CCB_DEVICE, Fcb); if (Ccb == NULL) { IoStatus->Status = STATUS_NO_MEMORY; return; } - - RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); - - Ccb->Type = CCB_DEVICE; - Ccb->Fcb = Fcb; FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -145,17 +210,12 @@ DPRINT("NpfsOpenRootDirectory()\n"); - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + Ccb = NpfsAllocateCcb(CCB_DIRECTORY, Fcb); if (Ccb == NULL) { IoStatus->Status = STATUS_NO_MEMORY; return; } - - RtlZeroMemory(Ccb, sizeof(NPFS_CCB)); - - Ccb->Type = CCB_DIRECTORY; - Ccb->Fcb = Fcb; FileObject->FsContext = Fcb; FileObject->FsContext2 = Ccb; @@ -244,8 +304,7 @@ * Step 1. Find the pipe we're trying to open. */ KeLockMutex(&Vcb->PipeListLock); - Fcb = NpfsFindPipe(Vcb, - &FileObject->FileName); + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb == NULL) { /* Not found, bail out with error. */ @@ -267,7 +326,7 @@ /* * Step 2. Create the client CCB. */ - ClientCcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); + ClientCcb = NpfsAllocateCcb(CCB_PIPE, Fcb); if (ClientCcb == NULL) { DPRINT("No memory!\n"); @@ -277,11 +336,8 @@ 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; #ifndef USING_PROPER_NPFS_WAIT_SEMANTICS ClientCcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; #else @@ -294,11 +350,13 @@ /* Initialize data list. */ if (Fcb->OutboundQuota) { - ClientCcb->Data = ExAllocatePool(PagedPool, Fcb->OutboundQuota); + ClientCcb->Data = ExAllocatePoolWithTag(PagedPool, + Fcb->OutboundQuota, + TAG_NPFS_CCB_DATA); if (ClientCcb->Data == NULL) { DPRINT("No memory!\n"); - ExFreePool(ClientCcb); + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -367,10 +425,10 @@ DPRINT("No listening server CCB found!\n"); if (ClientCcb->Data) { - ExFreePool(ClientCcb->Data); + ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); } - ExFreePool(ClientCcb); + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_OBJECT_PATH_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -391,10 +449,10 @@ if (ClientCcb->Data) { - ExFreePool(ClientCcb->Data); - } - - ExFreePool(ClientCcb); + ExFreePoolWithTag(ClientCcb->Data, TAG_NPFS_CCB_DATA); + } + + NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -413,8 +471,8 @@ /* Connect to listening server side */ if (ServerCcb) { - ClientCcb->OtherSide = ServerCcb; - ServerCcb->OtherSide = ClientCcb; + NpfsCcbSetOtherSide(ClientCcb, ServerCcb); + NpfsCcbSetOtherSide(ServerCcb, ClientCcb); ClientCcb->PipeState = FILE_PIPE_CONNECTED_STATE; ServerCcb->PipeState = FILE_PIPE_CONNECTED_STATE; KeSetEvent(&ServerCcb->ConnectEvent, IO_NO_INCREMENT, FALSE); @@ -467,23 +525,12 @@ return STATUS_INVALID_PARAMETER; } - Ccb = ExAllocatePool(NonPagedPool, sizeof(NPFS_CCB)); - if (Ccb == NULL) - { - Irp->IoStatus.Status = STATUS_NO_MEMORY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NO_MEMORY; - } - - Ccb->Type = CCB_PIPE; - Ccb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; KeLockMutex(&Vcb->PipeListLock); /* * First search for existing Pipe with the same name. */ - Fcb = NpfsFindPipe(Vcb, - &FileObject->FileName); + Fcb = NpfsFindPipe(Vcb, &FileObject->FileName); if (Fcb != NULL) { /* @@ -495,7 +542,6 @@ if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { DPRINT("Out of instances.\n"); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSTANCE_NOT_AVAILABLE; @@ -506,7 +552,6 @@ Fcb->PipeType != Buffer->NamedPipeType) { DPRINT("Asked for invalid pipe mode.\n"); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_ACCESS_DENIED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_ACCESS_DENIED; @@ -515,11 +560,10 @@ else { NewPipe = TRUE; - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); if (Fcb == NULL) { KeUnlockMutex(&Vcb->PipeListLock); - ExFreePool(Ccb); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -530,12 +574,13 @@ 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); + Fcb->PipeName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + Fcb->PipeName.MaximumLength, + TAG_NPFS_NAMEBLOCK); if (Fcb->PipeName.Buffer == NULL) { KeUnlockMutex(&Vcb->PipeListLock); - ExFreePool(Fcb); - ExFreePool(Ccb); + ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); Irp->IoStatus.Status = STATUS_NO_MEMORY; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -623,20 +668,33 @@ KeUnlockMutex(&Vcb->PipeListLock); } + Ccb = NpfsAllocateCcb(CCB_PIPE, Fcb); + if (Ccb == NULL) + { + if (NewPipe) + { + NpfsDeleteFcb(Fcb); + } + + Irp->IoStatus.Status = STATUS_NO_MEMORY; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NO_MEMORY; + } + + Ccb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; + if (Fcb->InboundQuota) { - Ccb->Data = ExAllocatePool(PagedPool, Fcb->InboundQuota); + Ccb->Data = ExAllocatePoolWithTag(PagedPool, + Fcb->InboundQuota, + TAG_NPFS_CCB_DATA); if (Ccb->Data == NULL) { - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); if (NewPipe) { - KeLockMutex(&Vcb->PipeListLock); - RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&Vcb->PipeListLock); - RtlFreeUnicodeString(&Fcb->PipeName); - ExFreePool(Fcb); + NpfsDeleteFcb(Fcb); } Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -662,7 +720,6 @@ Ccb->Fcb = Fcb; Ccb->PipeEnd = FILE_PIPE_SERVER_END; Ccb->PipeState = FILE_PIPE_LISTENING_STATE; - Ccb->OtherSide = NULL; DPRINT("CCB: %p\n", Ccb); @@ -753,6 +810,8 @@ if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->OtherSide)) { OtherSide = Ccb->OtherSide; + ASSERT(OtherSide->OtherSide == Ccb); + /* Lock the server first */ if (Server) { @@ -764,7 +823,11 @@ ExAcquireFastMutex(&OtherSide->DataListLock); ExAcquireFastMutex(&Ccb->DataListLock); } - OtherSide->OtherSide = NULL; + + /* Unlink FCBs */ + NpfsCcbSetOtherSide(OtherSide, NULL); + NpfsCcbSetOtherSide(Ccb, NULL); + /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -824,7 +887,7 @@ ExAcquireFastMutex(&Ccb->DataListLock); if (Ccb->Data) { - ExFreePool(Ccb->Data); + ExFreePoolWithTag(Ccb->Data, TAG_NPFS_CCB_DATA); Ccb->Data = NULL; Ccb->ReadPtr = NULL; Ccb->WritePtr = NULL; @@ -871,7 +934,7 @@ { DPRINT("Closing the file system!\n"); - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); FileObject->FsContext = NULL; FileObject->FsContext2 = NULL; @@ -886,9 +949,10 @@ DPRINT("Closing the root directory!\n"); if (Ccb->u.Directory.SearchPattern.Buffer != NULL) - ExFreePool(Ccb->u.Directory.SearchPattern.Buffer); - - ExFreePool(Ccb); + ExFreePoolWithTag(Ccb->u.Directory.SearchPattern.Buffer, + TAG_NPFS_NAMEBLOCK); + + NpfsDereferenceCcb(Ccb); FileObject->FsContext = NULL; FileObject->FsContext2 = NULL; @@ -920,8 +984,9 @@ /* Disconnect the pipes */ if (Ccb->OtherSide) { - Ccb->OtherSide->OtherSide = NULL; - Ccb->OtherSide = NULL; + ASSERT(Ccb->OtherSide->OtherSide == Ccb); + NpfsCcbSetOtherSide(Ccb->OtherSide, NULL); + NpfsCcbSetOtherSide(Ccb, NULL); } ASSERT(Ccb->PipeState == FILE_PIPE_CLOSING_STATE); @@ -930,18 +995,14 @@ RemoveEntryList(&Ccb->CcbListEntry); - ExFreePool(Ccb); + NpfsDereferenceCcb(Ccb); KeUnlockMutex(&Fcb->CcbListLock); if (IsListEmpty(&Fcb->ServerCcbListHead) && IsListEmpty(&Fcb->ClientCcbListHead)) { - KeLockMutex(&Vcb->PipeListLock); - RemoveEntryList(&Fcb->PipeListEntry); - KeUnlockMutex(&Vcb->PipeListLock); - RtlFreeUnicodeString(&Fcb->PipeName); - ExFreePool(Fcb); + NpfsDeleteFcb(Fcb); FileObject->FsContext = NULL; } Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Wed Jul 6 18:14:42 2011 @@ -71,7 +71,9 @@ if (SearchPattern != NULL) { Ccb->u.Directory.SearchPattern.Buffer = - ExAllocatePool(NonPagedPool, SearchPattern->Length + sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, + SearchPattern->Length + sizeof(WCHAR), + TAG_NPFS_NAMEBLOCK); if (Ccb->u.Directory.SearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -87,7 +89,9 @@ else { Ccb->u.Directory.SearchPattern.Buffer = - ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, + 2 * sizeof(WCHAR), + TAG_NPFS_NAMEBLOCK); if (Ccb->u.Directory.SearchPattern.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; 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] Wed Jul 6 18:14:42 2011 @@ -441,7 +441,9 @@ /* 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); + PipeName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + PipeName.MaximumLength, + TAG_NPFS_NAMEBLOCK); if (PipeName.Buffer == NULL) { DPRINT1("Could not allocate memory for the pipe name!\n"); @@ -471,7 +473,7 @@ KeUnlockMutex(&Vcb->PipeListLock); /* Release the pipe name buffer */ - ExFreePool(PipeName.Buffer); + ExFreePoolWithTag(PipeName.Buffer, TAG_NPFS_NAMEBLOCK); /* Fail if not pipe was found */ if (Fcb == NULL) 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] Wed Jul 6 18:14:42 2011 @@ -86,13 +86,13 @@ Vcb->MaxQuota = 64 * PAGE_SIZE; /* Create the device FCB */ - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DEVICE; Fcb->Vcb = Vcb; Vcb->DeviceFcb = Fcb; /* Create the root directory FCB */ - Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DIRECTORY; Fcb->Vcb = Vcb; Vcb->RootFcb = Fcb; 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] Wed Jul 6 18:14:42 2011 @@ -4,6 +4,12 @@ #include <ntifs.h> #include <ndk/iotypes.h> #include <pseh/pseh2.h> + +#define TAG_NPFS_CCB 'cFpN' +#define TAG_NPFS_CCB_DATA 'iFpN' /* correct? */ +#define TAG_NPFS_FCB 'FFpN' +#define TAG_NPFS_NAMEBLOCK 'nFpN' +#define TAG_NPFS_THREAD_CONTEXT 'tFpN' #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) @@ -87,6 +93,7 @@ ULONG PipeState; ULONG ReadDataAvailable; ULONG WriteQuotaAvailable; + ULONG RefCount; LIST_ENTRY ReadRequestListHead; 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] Wed Jul 6 18:14:42 2011 @@ -194,12 +194,11 @@ { /* it exist an other thread with empty wait slots, we can remove our thread from the list */ RemoveEntryList(&ThreadContext->ListEntry); - ThreadContext->Vcb->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1; + ExFreePoolWithTag(ThreadContext, TAG_NPFS_THREAD_CONTEXT); KeUnlockMutex(&ThreadContext->Vcb->PipeListLock); break; } } - ExFreePool(ThreadContext); } static NTSTATUS @@ -234,7 +233,9 @@ if (ListEntry == &Vcb->ThreadListHead) { - ThreadContext = ExAllocatePool(NonPagedPool, sizeof(NPFS_THREAD_CONTEXT)); + ThreadContext = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPFS_THREAD_CONTEXT), + TAG_NPFS_THREAD_CONTEXT); if (ThreadContext == NULL) { KeUnlockMutex(&Vcb->PipeListLock); @@ -257,7 +258,7 @@ (PVOID)ThreadContext); if (!NT_SUCCESS(Status)) { - ExFreePool(ThreadContext); + ExFreePoolWithTag(ThreadContext, TAG_NPFS_THREAD_CONTEXT); KeUnlockMutex(&Vcb->PipeListLock); return Status; } @@ -638,7 +639,7 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + CopyLength); Length -= CopyLength; } - else + else { KeResetEvent(&Ccb->ReadEvent);

1 0

[rharabien] 52546: [CDFS][FASTFAT][NPFS] - Fix MSVC warnings
by rharabien＠svn.reactos.org 05 Jul '11

05 Jul '11

Author: rharabien Date: Tue Jul 5 13:55:39 2011 New Revision: 52546 URL: http://svn.reactos.org/svn/reactos?rev=52546&view=rev Log: [CDFS][FASTFAT][NPFS] - Fix MSVC warnings Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/npfs/dirctl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -143,7 +143,7 @@ ULONG RootStart; ULONG RootSize; WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; - ULONG VolumeLabelLength; + USHORT VolumeLabelLength; ULONG SerialNumber; } CDINFO, *PCDINFO; Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -40,7 +40,7 @@ PUNICODE_STRING RelativeFileName, PUNICODE_STRING AbsoluteFileName) { - ULONG Length; + USHORT Length; PFCB Fcb; NTSTATUS Status; Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -533,7 +533,7 @@ /* Copy short name */ ASSERT(Fcb->ShortNameU.Length / sizeof(WCHAR) <= 12); - Info->ShortNameLength = Fcb->ShortNameU.Length; + Info->ShortNameLength = (CCHAR)Fcb->ShortNameU.Length; RtlCopyMemory(Info->ShortName, Fcb->ShortNameU.Buffer, Fcb->ShortNameU.Length); return(STATUS_SUCCESS); Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -153,7 +153,7 @@ ASSERT(Fcb != NULL); /* If buffer can't hold at least the file name length, bail out */ - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) return STATUS_BUFFER_OVERFLOW; /* Calculate file name length in bytes */ Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -46,7 +46,7 @@ PCDINFO CdInfo) { PPVD Pvd; - ULONG i; + USHORT i; PUCHAR pc; PWCHAR pw; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -379,7 +379,7 @@ ASSERT(FCB != NULL); /* If buffer can't hold at least the file name length, bail out */ - if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) return STATUS_BUFFER_OVERFLOW; /* Save file name length, and as much file len, as buffer length allows */ Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Tue Jul 5 13:55:39 2011 @@ -21,7 +21,7 @@ PULONG Size) { PIO_STACK_LOCATION Stack; - LONG BufferLength = 0; + ULONG BufferLength = 0; PUNICODE_STRING SearchPattern = NULL; FILE_INFORMATION_CLASS FileInformationClass; ULONG FileIndex = 0; 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] Tue Jul 5 13:55:39 2011 @@ -21,7 +21,7 @@ CHAR Line[65]; UCHAR ch; const char Hex[] = "0123456789ABCDEF"; - int i, j; + ULONG i, j; DbgPrint("---------------\n");

1 0

[rharabien] 52545: [MSAFD] - Fix MSVC warning
by rharabien＠svn.reactos.org 05 Jul '11

05 Jul '11

Author: rharabien Date: Tue Jul 5 12:21:17 2011 New Revision: 52545 URL: http://svn.reactos.org/svn/reactos?rev=52545&view=rev Log: [MSAFD] - Fix MSVC warning Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Jul 5 12:21:17 2011 @@ -806,7 +806,8 @@ IO_STATUS_BLOCK IOSB; PAFD_POLL_INFO PollInfo; NTSTATUS Status; - LONG HandleCount, OutCount = 0; + ULONG HandleCount; + LONG OutCount = 0; ULONG PollBufferSize; PVOID PollBuffer; ULONG i, j = 0, x; @@ -823,7 +824,7 @@ if ( HandleCount == 0 ) { - AFD_DbgPrint(MAX_TRACE,("HandleCount: %d. Return SOCKET_ERROR\n", + AFD_DbgPrint(MAX_TRACE,("HandleCount: %u. Return SOCKET_ERROR\n", HandleCount)); if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; @@ -831,7 +832,7 @@ PollBufferSize = sizeof(*PollInfo) + ((HandleCount - 1) * sizeof(AFD_HANDLE)); - AFD_DbgPrint(MID_TRACE,("HandleCount: %d BufferSize: %d\n", + AFD_DbgPrint(MID_TRACE,("HandleCount: %u BufferSize: %u\n", HandleCount, PollBufferSize)); /* Convert Timeout to NT Format */

1 0

[gadamopoulos] 52544: [uxtheme] - Use double buffering when painting the caption
by gadamopoulos＠svn.reactos.org 05 Jul '11

05 Jul '11

Author: gadamopoulos Date: Tue Jul 5 10:15:09 2011 New Revision: 52544 URL: http://svn.reactos.org/svn/reactos?rev=52544&view=rev Log: [uxtheme] - Use double buffering when painting the caption Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Jul 5 10:15:09 2011 @@ -26,6 +26,10 @@ BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ HRGN hRgn; int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; } DRAW_CONTEXT, *PDRAW_CONTEXT; typedef enum @@ -59,6 +63,7 @@ #define BUTTON_GAP_SIZE 2 +#define MENU_BAR_ITEMS_SPACE (12) HFONT hMenuFont = NULL; HFONT hMenuFontBold = NULL; @@ -235,6 +240,29 @@ } static void +ThemeStartBufferedPaint(PDRAW_CONTEXT pcontext, int cx, int cy) +{ + HBITMAP hbmp; + + pcontext->hDCScreen = pcontext->hDC; + pcontext->hDC = CreateCompatibleDC(pcontext->hDCScreen); + hbmp = CreateCompatibleBitmap(pcontext->hDCScreen, cx, cy); + pcontext->hbmpOld = (HBITMAP)SelectObject(pcontext->hDC, hbmp); +} + +static void +ThemeEndBufferedPaint(PDRAW_CONTEXT pcontext, int x, int y, int cx, int cy) +{ + HBITMAP hbmp; + BitBlt(pcontext->hDCScreen, 0, 0, cx, cy, pcontext->hDC, x, y, SRCCOPY); + hbmp = (HBITMAP) SelectObject(pcontext->hDC, pcontext->hbmpOld); + DeleteObject(pcontext->hDC); + DeleteObject(hbmp); + + pcontext->hDC = pcontext->hDCScreen; +} + +static void ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, RECT* prcCurrent, CAPTIONBUTTON buttonId, @@ -663,7 +691,9 @@ if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) { + ThemeStartBufferedPaint(pcontext, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawCaption(pcontext, prcCurrent); + ThemeEndBufferedPaint(pcontext, 0, 0, prcCurrent->right, pcontext->CaptionHeight); ThemeDrawBorders(pcontext, prcCurrent); } else

1 0

[gadamopoulos] 52543: [uxtheme] - Implement drawing the menu bar
by gadamopoulos＠svn.reactos.org 05 Jul '11

05 Jul '11

Author: gadamopoulos Date: Tue Jul 5 10:09:26 2011 New Revision: 52543 URL: http://svn.reactos.org/svn/reactos?rev=52543&view=rev Log: [uxtheme] - Implement drawing the menu bar Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Jul 5 10:09:26 2011 @@ -58,6 +58,28 @@ #define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) #define BUTTON_GAP_SIZE 2 + + +HFONT hMenuFont = NULL; +HFONT hMenuFontBold = NULL; + +void InitMenuFont(VOID) +{ + NONCLIENTMETRICS ncm; + + ncm.cbSize = sizeof(NONCLIENTMETRICS); + + if(!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + return ; + } + + hMenuFont = CreateFontIndirect(&ncm.lfMenuFont); + + ncm.lfMenuFont.lfWeight = max(ncm.lfMenuFont.lfWeight + 300, 1000); + hMenuFontBold = CreateFontIndirectW(&ncm.lfMenuFont); + +} static BOOL IsWindowActive(HWND hWnd, DWORD ExStyle) @@ -483,9 +505,142 @@ } static void +ThemeDrawMenuItem(PDRAW_CONTEXT pcontext, HMENU Menu, int imenu) +{ + PWCHAR Text; + BOOL flat_menu = FALSE; + MENUITEMINFOW Item; + RECT Rect,rcCalc; + WCHAR wstrItemText[20]; + register int i = 0; + HFONT FontOld = NULL; + UINT uFormat = DT_CENTER | DT_VCENTER | DT_SINGLELINE; + + Item.cbSize = sizeof(MENUITEMINFOW); + Item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; + Item.dwTypeData = wstrItemText; + Item.cch = 20; + if (!GetMenuItemInfoW(Menu, imenu, TRUE, &Item)) + return; + + if(Item.fType & MF_SEPARATOR) + return; + + if(Item.cch >= 20) + { + Item.cch++; + Item.dwTypeData = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, Item.cch * sizeof(WCHAR)); + Item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; + GetMenuItemInfoW(Menu, imenu, TRUE, &Item); + } + + if(Item.cch == 0) + return; + + flat_menu = GetThemeSysBool(pcontext->theme, TMT_FLATMENUS); + + GetMenuItemRect(pcontext->hWnd, Menu, imenu, &Rect); + + OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); + + SetBkColor(pcontext->hDC, GetSysColor(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); + SetTextColor(pcontext->hDC, GetSysColor(Item.fState & MF_GRAYED ? COLOR_GRAYTEXT : COLOR_MENUTEXT)); + + if (0 != (Item.fState & MFS_DEFAULT)) + { + FontOld = (HFONT)SelectObject(pcontext->hDC, hMenuFontBold); + } + + Rect.left += MENU_BAR_ITEMS_SPACE / 2; + Rect.right -= MENU_BAR_ITEMS_SPACE / 2; + + Text = (PWCHAR) Item.dwTypeData; + if(Text) + { + for (i = 0; L'\0' != Text[i]; i++) + { + if (L'\t' == Text[i] || L'\b' == Text[i]) + { + break; + } + } + } + + SetBkMode(pcontext->hDC, OPAQUE); + + if (0 != (Item.fState & MF_GRAYED)) + { + if (0 == (Item.fState & MF_HILITE)) + { + ++Rect.left; ++Rect.top; ++Rect.right; ++Rect.bottom; + SetTextColor(pcontext->hDC, RGB(0xff, 0xff, 0xff)); + DrawTextW(pcontext->hDC, Text, i, &Rect, uFormat); + --Rect.left; --Rect.top; --Rect.right; --Rect.bottom; + } + SetTextColor(pcontext->hDC, RGB(0x80, 0x80, 0x80)); + SetBkMode(pcontext->hDC, TRANSPARENT); + } + + DrawTextW(pcontext->hDC, Text, i, &Rect, uFormat); + + /* Exclude the area drawn by DrawText from the clip region */ + SetRect(&rcCalc, 0,0,0,0); + DrawTextW(pcontext->hDC, Text, i, &rcCalc, uFormat | DT_CALCRECT); + InflateRect( &Rect, 0, -(rcCalc.bottom+1)/2); + ExcludeClipRect(pcontext->hDC, Rect.left, Rect.top, Rect.right, Rect.bottom); + + if (NULL != FontOld) + { + SelectObject(pcontext->hDC, FontOld); + } +} + +void WINAPI ThemeDrawMenuBar(PDRAW_CONTEXT pcontext, PRECT prcCurrent) { - + HMENU Menu; + MENUBARINFO MenuBarInfo; + int i; + HFONT FontOld = NULL; + BOOL flat_menu; + RECT Rect; + HPEN oldPen ; + + if (!hMenuFont) + InitMenuFont(); + + flat_menu = GetThemeSysBool(pcontext->theme, TMT_FLATMENUS); + + MenuBarInfo.cbSize = sizeof(MENUBARINFO); + if (! GetMenuBarInfo(pcontext->hWnd, OBJID_MENU, 0, &MenuBarInfo)) + return; + + Menu = GetMenu(pcontext->hWnd); + if (GetMenuItemCount(Menu) == 0) + return; + + Rect = MenuBarInfo.rcBar; + OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); + + /* Draw a line under the menu*/ + oldPen = (HPEN)SelectObject(pcontext->hDC, GetStockObject(DC_PEN)); + SetDCPenColor(pcontext->hDC, GetSysColor(COLOR_3DFACE)); + MoveToEx(pcontext->hDC, Rect.left, Rect.bottom, NULL); + LineTo(pcontext->hDC, Rect.right, Rect.bottom); + SelectObject(pcontext->hDC, oldPen); + + /* Draw menu items */ + FontOld = (HFONT)SelectObject(pcontext->hDC, hMenuFont); + + for (i = 0; i < GetMenuItemCount(Menu); i++) + { + ThemeDrawMenuItem(pcontext, Menu, i); + } + + SelectObject(pcontext->hDC, FontOld); + + /* Fill the menu background area that isn't painted yet*/ + FillRect(pcontext->hDC, &Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); } static void

1 0

[gadamopoulos] 52542: [uxtheme] - Fill in WINDOWINFO.cbSize before calling GetWindowInfo - Handle invalid regions passed to WM_NCPAINT - Handle WM_NCUAHDRAWCAPTION and WM_NCUAHDRAWFRAME without doi...
by gadamopoulos＠svn.reactos.org 05 Jul '11

05 Jul '11

Author: gadamopoulos Date: Tue Jul 5 10:04:25 2011 New Revision: 52542 URL: http://svn.reactos.org/svn/reactos?rev=52542&view=rev Log: [uxtheme] - Fill in WINDOWINFO.cbSize before calling GetWindowInfo - Handle invalid regions passed to WM_NCPAINT - Handle WM_NCUAHDRAWCAPTION and WM_NCUAHDRAWFRAME without doing anything there for now Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Jul 5 10:04:25 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS uxtheme.dll - * FILE: dll/win32/uxtheme/themehooks.c + * FILE: dll/win32/uxtheme/nonclient.c * PURPOSE: uxtheme non client area management * PROGRAMMER: Giannis Adamopoulos */ @@ -181,6 +181,7 @@ HWND hWnd, HRGN hRgn) { + pcontext->wi.cbSize = sizeof(pcontext->wi); GetWindowInfo(hWnd, &pcontext->wi); pcontext->hWnd = hWnd; pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); @@ -189,15 +190,11 @@ pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; pcontext->CaptionHeight += GetSystemMetrics(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); - if(hRgn <= 0) + if(hRgn <= (HRGN)1) { hRgn = CreateRectRgnIndirect(&pcontext->wi.rcWindow); - pcontext->hRgn = hRgn; - } - else - { - pcontext->hRgn = 0; - } + } + pcontext->hRgn = hRgn; pcontext->hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); } @@ -905,7 +902,11 @@ Point.y = GET_Y_LPARAM(lParam); return DefWndNCHitTest(hWnd, Point); } + case WM_NCUAHDRAWCAPTION: + case WM_NCUAHDRAWFRAME: + /* FIXME: how should these be handled? */ + return 0; default: return DefWndProc(hWnd, Msg, wParam, lParam); } -} +}

1 0

[tfaber] 52541: [KMTESTS] - prepare the device object for being opened multiple times (required for communication with special-purpose drivers) - more verbose DPRINTs - implement utility functions ...
by tfaber＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: tfaber Date: Mon Jul 4 19:47:49 2011 New Revision: 52541 URL: http://svn.reactos.org/svn/reactos?rev=52541&view=rev Log: [KMTESTS] - prepare the device object for being opened multiple times (required for communication with special-purpose drivers) - more verbose DPRINTs - implement utility functions for app<->driver communication - misc fixes Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Mon Jul 4 19:47:49 2011 @@ -38,7 +38,14 @@ CHAR LogBuffer[ANYSIZE_ARRAY]; } KMT_RESULTBUFFER, *PKMT_RESULTBUFFER; -#if defined KMT_USER_MODE +#ifdef KMT_KERNEL_MODE +/* Device Extension layout */ +typedef struct +{ + PKMT_RESULTBUFFER ResultBuffer; + PMDL Mdl; +} KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; +#elif defined KMT_USER_MODE VOID KmtLoadDriver(IN PCWSTR ServiceName, IN BOOLEAN RestartIfRunning); VOID KmtUnloadDriver(VOID); VOID KmtOpenDriver(VOID); @@ -46,7 +53,7 @@ DWORD KmtSendToDriver(IN DWORD ControlCode); DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); -DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer, IN DWORD Length); +DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer, IN OUT PDWORD Length); #endif /* defined KMT_USER_MODE */ extern PKMT_RESULTBUFFER ResultBuffer; @@ -95,6 +102,11 @@ #define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) +#define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ + 0xA00 + (ControlCode), \ + METHOD_BUFFERED, \ + FILE_ANY_ACCESS) + #if defined KMT_DEFINE_TEST_FUNCTIONS PKMT_RESULTBUFFER ResultBuffer = NULL; @@ -122,6 +134,9 @@ { LONG OldLength; LONG NewLength; + + if (!Buffer) + return; do { @@ -199,6 +214,9 @@ CHAR MessageBuffer[512]; SIZE_T MessageLength; + if (!ResultBuffer) + return; + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, NULL, NULL, "%s: %ld tests executed (0 marked as todo, %ld failures), %ld skipped.\n", TestName, @@ -213,6 +231,9 @@ CHAR MessageBuffer[512]; SIZE_T MessageLength; + if (!ResultBuffer) + return; + if (Condition) { InterlockedIncrement(&ResultBuffer->Successes); @@ -260,6 +281,9 @@ { CHAR MessageBuffer[512]; SIZE_T MessageLength; + + if (!ResultBuffer) + return !Condition; if (!Condition) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Mon Jul 4 19:47:49 2011 @@ -9,13 +9,13 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <strsafe.h> +#include <winioctl.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include "kmtest.h" -#include <winioctl.h> #include <kmt_public.h> #define KMT_DEFINE_TEST_FUNCTIONS #include <kmt_test.h> @@ -187,7 +187,7 @@ KmtFinishTest(TestName); if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &BytesWritten, NULL)) - Error = GetLastError(); + error(Error); return Error; } @@ -229,7 +229,8 @@ error_goto(Error, cleanup); cleanup: - OutputResult(TestName); + if (!Error) + OutputResult(TestName); KmtFreeResultBuffer(ResultBuffer); Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Mon Jul 4 19:47:49 2011 @@ -9,20 +9,26 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <strsafe.h> +#include <winioctl.h> + +#include <assert.h> #include "kmtest.h" +#include <kmt_public.h> #include <kmt_test.h> -#include <kmt_public.h> /* pseudo-tests */ START_TEST(Create) { - // nothing to do here. All tests start the service if needed + // nothing to do here. All tests create the service if needed } START_TEST(Delete) { - // TODO: delete kmtest service + SC_HANDLE Handle = NULL; + DWORD Error = KmtDeleteService(L"Kmtest", &Handle); + + ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); } START_TEST(Start) @@ -32,7 +38,14 @@ START_TEST(Stop) { - // TODO: stop kmtest service + // TODO: requiring the service to be started for this is... bad, + // especially when it's marked for deletion and won't start ;) + SC_HANDLE Handle = NULL; + DWORD Error = KmtStopService(L"Kmtest", &Handle); + + ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); + Error = KmtCloseService(&Handle); + ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); } /* test support functions for special-purpose drivers */ @@ -107,7 +120,7 @@ StringCbCopy(DevicePath, sizeof DevicePath, L"\\\\.\\Global\\GLOBALROOT\\Device\\"); StringCbCat(DevicePath, sizeof DevicePath, TestServiceName); - TestDeviceHandle = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + TestDeviceHandle = CreateFile(DevicePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (TestDeviceHandle == INVALID_HANDLE_VALUE) error(Error); @@ -138,8 +151,6 @@ __debugbreak(); } } - -/* TODO: check if these will be useful */ /** * @name KmtSendToDriver @@ -154,8 +165,12 @@ KmtSendToDriver( IN DWORD ControlCode) { - // TODO - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD BytesRead; + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), NULL, 0, NULL, 0, &BytesRead, NULL)) + return GetLastError(); + + return ERROR_SUCCESS; } /** @@ -173,8 +188,12 @@ IN DWORD ControlCode, IN PCSTR String) { - // TODO - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD BytesRead; + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), (PVOID)String, strlen(String), NULL, 0, &BytesRead, NULL)) + return GetLastError(); + + return ERROR_SUCCESS; } /** @@ -190,8 +209,12 @@ KmtSendBufferToDriver( IN DWORD ControlCode, IN OUT PVOID Buffer, - IN DWORD Length) -{ - // TODO - return ERROR_CALL_NOT_IMPLEMENTED; + IN OUT PDWORD Length) +{ + assert(Length); + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), Buffer, *Length, NULL, 0, Length, NULL)) + return GetLastError(); + + return ERROR_SUCCESS; } Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Mon Jul 4 19:47:49 2011 @@ -24,13 +24,6 @@ static DRIVER_DISPATCH DriverClose; static DRIVER_DISPATCH DriverIoControl; -/* Device Extension layout */ -typedef struct -{ - PKMT_RESULTBUFFER ResultBuffer; - PMDL Mdl; -} KMT_DEVICE_EXTENSION, *PKMT_DEVICE_EXTENSION; - /* Globals */ static PDEVICE_OBJECT MainDeviceObject; @@ -68,13 +61,13 @@ &DeviceName, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, - TRUE, &MainDeviceObject); + FALSE, &MainDeviceObject); if (!NT_SUCCESS(Status)) goto cleanup; - DPRINT("DriverEntry. Created DeviceObject %p\n", - MainDeviceObject); + DPRINT("DriverEntry. Created DeviceObject %p. DeviceExtension %p\n", + MainDeviceObject, MainDeviceObject->DeviceExtension); DeviceExtension = MainDeviceObject->DeviceExtension; DeviceExtension->ResultBuffer = NULL; DeviceExtension->Mdl = NULL; @@ -146,19 +139,14 @@ { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStackLocation; - PKMT_DEVICE_EXTENSION DeviceExtension; PAGED_CODE(); IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - DPRINT("DriverCreate. DeviceObject=%p\n", - DeviceObject); - - DeviceExtension = DeviceObject->DeviceExtension; - ASSERT(!DeviceExtension->Mdl); - ASSERT(!DeviceExtension->ResultBuffer); - ASSERT(!ResultBuffer); + DPRINT("DriverCreate. DeviceObject=%p, RequestorMode=%d, FileObject=%p, FsContext=%p, FsContext2=%p\n", + DeviceObject, Irp->RequestorMode, IoStackLocation->FileObject, + IoStackLocation->FileObject->FsContext, IoStackLocation->FileObject->FsContext2); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -195,17 +183,23 @@ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - DPRINT("DriverClose. DeviceObject=%p\n", - DeviceObject); - + DPRINT("DriverClose. DeviceObject=%p, RequestorMode=%d, FileObject=%p, FsContext=%p, FsContext2=%p\n", + DeviceObject, Irp->RequestorMode, IoStackLocation->FileObject, + IoStackLocation->FileObject->FsContext, IoStackLocation->FileObject->FsContext2); + + ASSERT(IoStackLocation->FileObject->FsContext2 == NULL); DeviceExtension = DeviceObject->DeviceExtension; - if (DeviceExtension->Mdl) + if (DeviceExtension->Mdl && IoStackLocation->FileObject->FsContext == DeviceExtension->Mdl) { MmUnlockPages(DeviceExtension->Mdl); IoFreeMdl(DeviceExtension->Mdl); DeviceExtension->Mdl = NULL; ResultBuffer = DeviceExtension->ResultBuffer = NULL; } + else + { + ASSERT(IoStackLocation->FileObject->FsContext == NULL); + } Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -242,9 +236,10 @@ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - DPRINT("DriverIoControl. Code=0x%08X, DeviceObject=%p\n", + DPRINT("DriverIoControl. Code=0x%08X, DeviceObject=%p, FileObject=%p, FsContext=%p, FsContext2=%p\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode, - DeviceObject); + DeviceObject, IoStackLocation->FileObject, + IoStackLocation->FileObject->FsContext, IoStackLocation->FileObject->FsContext2); switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) { @@ -315,8 +310,15 @@ if (DeviceExtension->Mdl) { + if (IoStackLocation->FileObject->FsContext != DeviceExtension->Mdl) + { + Status = STATUS_ACCESS_DENIED; + break; + } MmUnlockPages(DeviceExtension->Mdl); IoFreeMdl(DeviceExtension->Mdl); + IoStackLocation->FileObject->FsContext = NULL; + ResultBuffer = DeviceExtension->ResultBuffer = NULL; } DeviceExtension->Mdl = IoAllocateMdl(IoStackLocation->Parameters.DeviceIoControl.Type3InputBuffer, @@ -341,6 +343,7 @@ } _SEH2_END; ResultBuffer = DeviceExtension->ResultBuffer = MmGetSystemAddressForMdlSafe(DeviceExtension->Mdl, NormalPagePriority); + IoStackLocation->FileObject->FsContext = DeviceExtension->Mdl; DPRINT("DriverIoControl. ResultBuffer: %ld %ld %ld %ld\n", ResultBuffer->Successes, ResultBuffer->Failures,

1 0

[cgutman] 52540: [USETUP] - Remove formatting and partitioning hacks which are unnecessary after fixing the invalid signature bug in the FAT formatting code
by cgutman＠svn.reactos.org 04 Jul '11

04 Jul '11

Author: cgutman Date: Mon Jul 4 19:39:34 2011 New Revision: 52540 URL: http://svn.reactos.org/svn/reactos?rev=52540&view=rev Log: [USETUP] - Remove formatting and partitioning hacks which are unnecessary after fixing the invalid signature bug in the FAT formatting code Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jul 4 19:39:34 2011 @@ -2450,75 +2450,6 @@ CheckActiveBootPartition(PartitionList); } - if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) - { - /* FIXME: Install boot code. This is a hack! */ - if ((PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32_XINT13) || - (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32)) - { - wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\fat32.bin"); - - DPRINT("Install FAT32 bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); - - Status = InstallFat32BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallFat32BootCodeToDisk() failed with status 0x%08lx\n", Status); - /* FIXME: show an error dialog */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return QUIT_PAGE; - } - } - else - { - wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\fat.bin"); - - DPRINT("Install FAT bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); - - Status = InstallFat16BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallFat16BootCodeToDisk() failed with status 0x%.08x\n", Status); - /* FIXME: show an error dialog */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return QUIT_PAGE; - } - } - } - else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) - { - wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\ext2.bin"); - - DPRINT("Install EXT2 bootcode: %S ==> %S\n", PathBuffer, - DestinationRootPath.Buffer); - - Status = InstallFat32BootCodeToDisk(PathBuffer, - DestinationRootPath.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallFat32BootCodeToDisk() failed with status 0x%08lx\n", Status); - /* FIXME: show an error dialog */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return QUIT_PAGE; - } - } - else if (FileSystemList->Selected->FormatFunc) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return QUIT_PAGE; - } - #ifndef NDEBUG CONSOLE_SetStatusText(" Done. Press any key ..."); CONSOLE_ConInKey(Ir); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Jul 4 19:39:34 2011 @@ -2495,7 +2495,6 @@ PDRIVE_LAYOUT_INFORMATION DriveLayout; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK Iosb; - WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; UNICODE_STRING Name; HANDLE FileHandle; @@ -2689,30 +2688,6 @@ DriveLayout); NtClose (FileHandle); - - /* Install MBR code if the disk is new */ - if (DiskEntry1->NewDisk == TRUE && - DiskEntry1->BiosDiskNumber == 0) - { - wcscpy (SrcPath, SourceRootPath.Buffer); - wcscat (SrcPath, L"\\loader\\dosmbr.bin"); - - DPRINT ("Install MBR bootcode: %S ==> %S\n", - SrcPath, DstPath); - - /* Install MBR bootcode */ - Status = InstallMbrBootCodeToDisk (SrcPath, - DstPath); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); - return FALSE; - } - - DiskEntry1->NewDisk = FALSE; - DiskEntry1->NoMbr = FALSE; - } } Entry1 = Entry1->Flink;

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