Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[tfaber] 69300: [KMTESTS:KE] - Add tests for acquiring mutants recursively CORE-10218

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 19 23:59:02 2015 New Revision: 69300 URL: http://svn.reactos.org/svn/reactos?rev=69300&view=rev Log: [KMTESTS:KE] - Add tests for acquiring mutants recursively CORE-10218 Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Sat Sep 19 23:59:02 2015 @@ -21,7 +21,7 @@ C_ASSERT(sizeof(KMUTANT) == sizeof(DISPATCHER_HEADER) + 3 * sizeof(PVOID) + sizeof(PVOID)); C_ASSERT(sizeof(KMUTANT) == MUTANT_SIZE * sizeof(ULONG)); -#define CheckMutex(Mutex, Held, New, ExpectedApcDisable) do { \ +#define CheckMutex(Mutex, State, New, ExpectedApcDisable) do { \ PKTHREAD Thread = KeGetCurrentThread(); \ ok_eq_uint((Mutex)->Header.Type, MutantObject); \ ok_eq_uint((Mutex)->Header.Abandoned, 0x55); \ @@ -31,9 +31,9 @@ &(Mutex)->Header.WaitListHead); \ ok_eq_pointer((Mutex)->Header.WaitListHead.Blink, \ &(Mutex)->Header.WaitListHead); \ - if (Held) \ + if ((State) <= 0) \ { \ - ok_eq_long((Mutex)->Header.SignalState, 0); \ + ok_eq_long((Mutex)->Header.SignalState, State); \ ok_eq_pointer((Mutex)->MutantListEntry.Flink, &Thread->MutantListHead); \ ok_eq_pointer((Mutex)->MutantListEntry.Blink, &Thread->MutantListHead); \ ok_eq_pointer(Thread->MutantListHead.Flink, &(Mutex)->MutantListEntry); \ @@ -42,7 +42,7 @@ } \ else \ { \ - ok_eq_long((Mutex)->Header.SignalState, 1); \ + ok_eq_long((Mutex)->Header.SignalState, State); \ if (New) \ { \ ok_eq_pointer((Mutex)->MutantListEntry.Flink, \ @@ -75,21 +75,22 @@ NTSTATUS Status; KMUTANT Mutant; LONG State; + LONG i; PKTHREAD Thread = KeGetCurrentThread(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); KeInitializeMutant(&Mutant, FALSE); - CheckMutex(&Mutant, FALSE, TRUE, 0); + CheckMutex(&Mutant, 1L, TRUE, 0); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); KeInitializeMutant(&Mutant, TRUE); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - CheckMutex(&Mutant, TRUE, TRUE, 0); - State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); - ok_eq_long(State, 0); - CheckMutex(&Mutant, FALSE, FALSE, 0); + CheckMutex(&Mutant, 0L, TRUE, 0); + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutant, 1L, FALSE, 0); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* Acquire and release */ @@ -99,12 +100,99 @@ FALSE, NULL); ok_eq_hex(Status, STATUS_SUCCESS); - CheckMutex(&Mutant, TRUE, TRUE, 0); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); - ok_eq_long(State, 0); - CheckMutex(&Mutant, FALSE, FALSE, 0); + CheckMutex(&Mutant, 0L, TRUE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutant, 1L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Acquire recursively */ + for (i = 0; i < 8; i++) + { + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutant, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutant, -i, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } + + for (i = 0; i < 7; i++) + { + KmtStartSeh() + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_long(State, -7L + i); + CheckMutex(&Mutant, -6L + i, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } + + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutant, 1L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Pretend to acquire it recursively -MINLONG times */ + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutant, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutant, 0L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + Mutant.Header.SignalState = MINLONG + 1; + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutant, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutant, (LONG)MINLONG, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KmtStartSeh() + KeWaitForSingleObject(&Mutant, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_MUTANT_LIMIT_EXCEEDED); + CheckMutex(&Mutant, (LONG)MINLONG, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, (LONG)MINLONG); + CheckMutex(&Mutant, (LONG)MINLONG + 1L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + Mutant.Header.SignalState = -1; + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, -1L); + CheckMutex(&Mutant, 0L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutant, 1L, FALSE, 0); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Now release it once too often */ + KmtStartSeh() + KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + KmtEndSeh(STATUS_MUTANT_NOT_OWNED); + CheckMutex(&Mutant, 1L, FALSE, 0); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } @@ -115,31 +203,120 @@ NTSTATUS Status; KMUTEX Mutex; LONG State; + LONG i; PKTHREAD Thread = KeGetCurrentThread(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); KeInitializeMutex(&Mutex, 0); - CheckMutex(&Mutex, FALSE, TRUE, 1); + CheckMutex(&Mutex, 1L, TRUE, 1); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); KeInitializeMutex(&Mutex, 123); - CheckMutex(&Mutex, FALSE, TRUE, 1); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - + CheckMutex(&Mutex, 1L, TRUE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Acquire and release */ Status = KeWaitForSingleObject(&Mutex, Executive, KernelMode, FALSE, NULL); ok_eq_hex(Status, STATUS_SUCCESS); - CheckMutex(&Mutex, TRUE, FALSE, 1); - CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); - - State = KeReleaseMutex(&Mutex, FALSE); - ok_eq_long(State, 0); - CheckMutex(&Mutex, FALSE, FALSE, 1); + CheckMutex(&Mutex, 0L, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutex, 1L, FALSE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Acquire recursively */ + for (i = 0; i < 8; i++) + { + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutex, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutex, -i, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + } + + for (i = 0; i < 7; i++) + { + KmtStartSeh() + State = KeReleaseMutex(&Mutex, FALSE); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_long(State, -7L + i); + CheckMutex(&Mutex, -6L + i, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + } + + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutex, 1L, FALSE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Pretend to acquire it recursively -MINLONG times */ + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutex, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutex, 0L, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + Mutex.Header.SignalState = MINLONG + 1; + KmtStartSeh() + Status = KeWaitForSingleObject(&Mutex, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckMutex(&Mutex, (LONG)MINLONG, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + KmtStartSeh() + KeWaitForSingleObject(&Mutex, + Executive, + KernelMode, + FALSE, + NULL); + KmtEndSeh(STATUS_MUTANT_LIMIT_EXCEEDED); + CheckMutex(&Mutex, (LONG)MINLONG, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, (LONG)MINLONG); + CheckMutex(&Mutex, (LONG)MINLONG + 1L, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + Mutex.Header.SignalState = -1; + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, -1L); + CheckMutex(&Mutex, 0L, FALSE, 1); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + + State = KeReleaseMutex(&Mutex, FALSE); + ok_eq_long(State, 0L); + CheckMutex(&Mutex, 1L, FALSE, 1); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* Now release it once too often */ + KmtStartSeh() + KeReleaseMutex(&Mutex, FALSE); + KmtEndSeh(STATUS_MUTANT_NOT_OWNED); + CheckMutex(&Mutex, 1L, FALSE, 1); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); }

9 years, 3 months

[aandrejevic] 69299: [NTVDM] Also save and restore the registers around other mouse callbacks and the DOS driver routine calls.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Sep 19 22:42:13 2015 New Revision: 69299 URL: http://svn.reactos.org/svn/reactos?rev=69299&view=rev Log: [NTVDM] Also save and restore the registers around other mouse callbacks and the DOS driver routine calls. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Sat Sep 19 22:42:13 2015 @@ -47,8 +47,15 @@ static VOID DosCallDriver(DWORD Driver, PDOS_REQUEST_HEADER Request) { PDOS_DRIVER DriverBlock = (PDOS_DRIVER)FAR_POINTER(Driver); + WORD AX = getAX(); + WORD CX = getCX(); + WORD DX = getDX(); + WORD BX = getBX(); + WORD BP = getBP(); + WORD SI = getSI(); + WORD DI = getDI(); + WORD DS = getDS(); WORD ES = getES(); - WORD BX = getBX(); /* Set ES:BX to the location of the request */ setES(DOS_DATA_SEGMENT); @@ -64,9 +71,16 @@ /* Get the request structure from ES:BX */ RtlMoveMemory(Request, &Sda->Request, Request->RequestLength); - /* Restore ES:BX */ + /* Restore the registers */ + setAX(AX); + setCX(CX); + setDX(DX); + setBX(BX); + setBP(BP); + setSI(SI); + setDI(DI); + setDS(DS); setES(ES); - setBX(BX); } static inline WORD NTAPI DosDriverReadInternal(PDOS_DEVICE_NODE DeviceNode, Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sat Sep 19 22:42:13 2015 @@ -310,8 +310,11 @@ BX = getBX(); CX = getCX(); DX = getDX(); + BP = getBP(); SI = getSI(); DI = getDI(); + DS = getDS(); + ES = getES(); setAX(CallMask); setBX(DriverState.ButtonState); @@ -333,8 +336,11 @@ setBX(BX); setCX(CX); setDX(DX); + setBP(BP); setSI(SI); setDI(DI); + setDS(DS); + setES(ES); } } }

9 years, 3 months

[aandrejevic] 69298: [NTVDM] Save and restore BP, DS and ES when calling the mouse callback.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Sep 19 22:29:45 2015 New Revision: 69298 URL: http://svn.reactos.org/svn/reactos?rev=69298&view=rev Log: [NTVDM] Save and restore BP, DS and ES when calling the mouse callback. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sat Sep 19 22:29:45 2015 @@ -243,7 +243,7 @@ static VOID CallMouseUserHandlers(USHORT CallMask) { USHORT i; - USHORT AX, BX, CX, DX, SI, DI; + USHORT AX, BX, CX, DX, BP, SI, DI, DS, ES; COORD Position = DriverState.Position; ToMouseCoordinates(&Position); @@ -262,8 +262,11 @@ BX = getBX(); CX = getCX(); DX = getDX(); + BP = getBP(); SI = getSI(); DI = getDI(); + DS = getDS(); + ES = getES(); setAX(CallMask); setBX(DriverState.ButtonState); @@ -284,8 +287,11 @@ setBX(BX); setCX(CX); setDX(DX); + setBP(BP); setSI(SI); setDI(DI); + setDS(DS); + setES(ES); } for (i = 0; i < ARRAYSIZE(DriverState.Handlers); ++i)

9 years, 3 months

[aandrejevic] 69297: [NTVDM] Save and restore the general purpose and segment registers around Int32Call calls in the BIOS. Also, make sure CF doesn't get set by the called interrupt procedure.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Sep 19 22:12:56 2015 New Revision: 69297 URL: http://svn.reactos.org/svn/reactos?rev=69297&view=rev Log: [NTVDM] Save and restore the general purpose and segment registers around Int32Call calls in the BIOS. Also, make sure CF doesn't get set by the called interrupt procedure. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Sep 19 22:12:56 2015 @@ -721,7 +721,30 @@ * because some programs may hook only BIOS_SYS_TIMER_INTERRUPT * for their purpose... */ + + WORD AX = getAX(); + WORD CX = getCX(); + WORD DX = getDX(); + WORD BX = getBX(); + WORD BP = getBP(); + WORD SI = getSI(); + WORD DI = getDI(); + WORD DS = getDS(); + WORD ES = getES(); + Int32Call(&BiosContext, BIOS_SYS_TIMER_INTERRUPT); + + setAX(AX); + setCX(CX); + setDX(DX); + setBX(BX); + setBP(BP); + setSI(SI); + setDI(DI); + setDS(DS); + setES(ES); + setCF(0); + // BiosSystemTimerInterrupt(Stack); PicIRQComplete(LOBYTE(Stack[STACK_INT_NUM])); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Sep 19 22:12:56 2015 @@ -209,8 +209,15 @@ * In return, if CF is set we continue processing the scan code * stored in AL, and if not, we skip it. */ - BYTE CF = getCF(); WORD AX = getAX(); + WORD CX = getCX(); + WORD DX = getDX(); + WORD BX = getBX(); + WORD BP = getBP(); + WORD SI = getSI(); + WORD DI = getDI(); + WORD DS = getDS(); + WORD ES = getES(); setCF(1); setAL(IOReadB(PS2_DATA_PORT)); @@ -222,7 +229,15 @@ ScanCode = getAL(); setAX(AX); - setCF(CF); + setCX(CX); + setDX(DX); + setBX(BX); + setBP(BP); + setSI(SI); + setDI(DI); + setDS(DS); + setES(ES); + setCF(0); if (ScanCode == 0xE0) {

9 years, 3 months

[tfaber] 69296: [KMTESTS] - Add missing OBJ_KERNEL_HANDLE - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a define around it CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 19 21:46:40 2015 New Revision: 69296 URL: http://svn.reactos.org/svn/reactos?rev=69296&view=rev Log: [KMTESTS] - Add missing OBJ_KERNEL_HANDLE - OBJ_KERNEL_HANDLE in user mode has no effect... no reason to make a define around it CORE-10207 Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c trunk/rostests/kmtests/ntos_ke/KeEvent.c trunk/rostests/kmtests/rtl/RtlRegistry.c Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Sat Sep 19 21:46:40 2015 @@ -454,7 +454,7 @@ ok_eq_hex(IoStatusBlock.Status, 0xFFFFFFFF); if (Status == STATUS_SUCCESS) { - ObCloseHandle(ParentHandle, KernelMode); + ObCloseHandle(ParentHandle, UserMode); } /* Attempt relative target open */ @@ -462,7 +462,7 @@ IoStatusBlock.Information = 0xFFFFFFFF; InitializeObjectAttributes(&ObjectAttributes, &SystemRoot, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenFile(&SystemRootHandle, GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE, @@ -478,7 +478,7 @@ IoStatusBlock.Information = 0xFFFFFFFF; InitializeObjectAttributes(&ObjectAttributes, &Regedit, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, SystemRootHandle, NULL); Status = IoCreateFile(&ParentHandle, Modified: trunk/rostests/kmtests/ntos_ke/KeEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeEvent.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] Sat Sep 19 21:46:40 2015 @@ -155,6 +155,7 @@ PVOID ThreadObjects[RTL_NUMBER_OF(Threads)]; LONG State; PKTHREAD Thread = KeGetCurrentThread(); + OBJECT_ATTRIBUTES ObjectAttributes; LongTimeout.QuadPart = -100 * MILLISECOND; ShortTimeout.QuadPart = -1 * MILLISECOND; @@ -165,7 +166,12 @@ { Threads[i].Event = Event; Threads[i].Signal = FALSE; - Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, NULL, NULL, NULL, WaitForEventThread, &Threads[i]); + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, &ObjectAttributes, NULL, NULL, WaitForEventThread, &Threads[i]); ok_eq_hex(Status, STATUS_SUCCESS); Status = ObReferenceObjectByHandle(Threads[i].Handle, SYNCHRONIZE, *PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); Modified: trunk/rostests/kmtests/rtl/RtlRegistry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlRegistry.c… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] Sat Sep 19 21:46:40 2015 @@ -7,12 +7,6 @@ #define KMT_EMULATE_KERNEL #include <kmt_test.h> - -#ifdef KMT_KERNEL_MODE -#define KMT_KERNEL_HANDLE OBJ_KERNEL_HANDLE -#else -#define KMT_KERNEL_HANDLE 0 -#endif #ifndef RTL_NUMBER_OF #define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) @@ -212,7 +206,7 @@ RtlInitUnicodeString(&KeyName, L"\\Registry\\MACHINE\\Software"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey(&SoftwareHandle, @@ -225,7 +219,7 @@ RtlInitUnicodeString(&KeyName, L"RtlRegistryKmtestKey"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, SoftwareHandle, NULL); Status = ZwCreateKey(&KeyHandle,

9 years, 3 months

[pschweitzer] 69295: [MOUNTMGR] Fix CVE-2015-1769: - When opening remote databases, don't attempt to migrate w2k database to current format. - Also, when opening/creating the remote database, don't...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 19 21:23:45 2015 New Revision: 69295 URL: http://svn.reactos.org/svn/reactos?rev=69295&view=rev Log: [MOUNTMGR] Fix CVE-2015-1769: - When opening remote databases, don't attempt to migrate w2k database to current format. - Also, when opening/creating the remote database, don't allow following symlinks anymore. In case a symlink would be detected, an error message will be printed. Commit dedicated to Alex :-). CORE-10216 #resolve #comment Fixed with r69295 Modified: trunk/reactos/drivers/filters/mountmgr/database.c Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Sat Sep 19 21:23:45 2015 @@ -32,7 +32,6 @@ PWSTR OfflinePath = L"\\Registry\\Machine\\System\\MountedDevices\\Offline"; UNICODE_STRING RemoteDatabase = RTL_CONSTANT_STRING(L"\\System Volume Information\\MountPointManagerRemoteDatabase"); -UNICODE_STRING RemoteDatabaseFile = RTL_CONSTANT_STRING(L"\\:$MountMgrRemoteDatabase"); /* * @implemented @@ -1664,22 +1663,16 @@ */ VOID NTAPI -MigrateRemoteDatabaseWorker(IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - ULONG Length; +CreateRemoteDatabaseWorker(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ NTSTATUS Status; - PVOID TmpBuffer; - CHAR Disposition; - LARGE_INTEGER ByteOffset; + HANDLE Database = 0; + UNICODE_STRING DatabaseName; PMIGRATE_WORK_ITEM WorkItem; IO_STATUS_BLOCK IoStatusBlock; - HANDLE Migrate = 0, Database = 0; + OBJECT_ATTRIBUTES ObjectAttributes; PDEVICE_INFORMATION DeviceInformation; - BOOLEAN PreviousMode, Complete = FALSE; - UNICODE_STRING DatabaseName, DatabaseFile; - OBJECT_ATTRIBUTES ObjectAttributes, MigrateAttributes; -#define TEMP_BUFFER_SIZE 0x200 UNREFERENCED_PARAMETER(DeviceObject); @@ -1690,15 +1683,8 @@ /* Reconstruct appropriate string */ DatabaseName.Length = DeviceInformation->DeviceName.Length + RemoteDatabase.Length; DatabaseName.MaximumLength = DatabaseName.Length + sizeof(WCHAR); - - DatabaseFile.Length = DeviceInformation->DeviceName.Length + RemoteDatabaseFile.Length; - DatabaseFile.MaximumLength = DatabaseFile.Length + sizeof(WCHAR); - DatabaseName.Buffer = AllocatePool(DatabaseName.MaximumLength); - DatabaseFile.Buffer = AllocatePool(DatabaseFile.MaximumLength); - /* Allocate buffer that will be used to swap contents */ - TmpBuffer = AllocatePool(TEMP_BUFFER_SIZE); - if (!DatabaseName.Buffer || !DatabaseFile.Buffer || !TmpBuffer) + if (DatabaseName.Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; goto Cleanup; @@ -1715,13 +1701,9 @@ /* Finish initating strings */ RtlCopyMemory(DatabaseName.Buffer, DeviceInformation->DeviceName.Buffer, DeviceInformation->DeviceName.Length); - RtlCopyMemory(DatabaseFile.Buffer, DeviceInformation->DeviceName.Buffer, DeviceInformation->DeviceName.Length); RtlCopyMemory(DatabaseName.Buffer + (DeviceInformation->DeviceName.Length / sizeof(WCHAR)), RemoteDatabase.Buffer, RemoteDatabase.Length); - RtlCopyMemory(DatabaseFile.Buffer + (DeviceInformation->DeviceName.Length / sizeof(WCHAR)), - RemoteDatabaseFile.Buffer, RemoteDatabaseFile.Length); DatabaseName.Buffer[DatabaseName.Length / sizeof(WCHAR)] = UNICODE_NULL; - DatabaseFile.Buffer[DatabaseFile.Length / sizeof(WCHAR)] = UNICODE_NULL; /* Create database */ InitializeObjectAttributes(&ObjectAttributes, @@ -1730,7 +1712,7 @@ NULL, NULL); - Status = ZwCreateFile(&Database, + Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, @@ -1742,123 +1724,32 @@ FILE_CREATE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_ALERT, NULL, - 0); + 0, + CreateFileTypeNone, + NULL, + IO_STOP_ON_SYMLINK); if (!NT_SUCCESS(Status)) { + if (Status == STATUS_STOPPED_ON_SYMLINK) + { + DPRINT1("Attempt to exploit CVE-2015-1769. See CORE-10216\n"); + } + Database = 0; goto Cleanup; } - InitializeObjectAttributes(&MigrateAttributes, - &DatabaseFile, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - - /* Disable hard errors and open the database that will be copied */ - PreviousMode = IoSetThreadHardErrorMode(FALSE); - Status = ZwCreateFile(&Migrate, - SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | - FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, - &MigrateAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, - 0, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_ALERT, - NULL, - 0); - IoSetThreadHardErrorMode(PreviousMode); - if (!NT_SUCCESS(Status)) - { - Migrate = 0; - } - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - Status = STATUS_SUCCESS; - Complete = TRUE; - } - if (!NT_SUCCESS(Status) || Complete) - { - goto Cleanup; - } - - ByteOffset.QuadPart = 0LL; - PreviousMode = IoSetThreadHardErrorMode(FALSE); - /* Now, loop as long it's possible */ - while (Status == STATUS_SUCCESS) - { - /* Read data from existing database */ - Status = ZwReadFile(Migrate, - NULL, - NULL, - NULL, - &IoStatusBlock, - TmpBuffer, - TEMP_BUFFER_SIZE, - &ByteOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - break; - } - - /* And write them into new database */ - Length = (ULONG)IoStatusBlock.Information; - Status = ZwWriteFile(Database, - NULL, - NULL, - NULL, - &IoStatusBlock, - TmpBuffer, - Length, - &ByteOffset, - NULL); - ByteOffset.QuadPart += Length; - } - IoSetThreadHardErrorMode(PreviousMode); - - /* Delete old databse if it was well copied */ - if (Status == STATUS_END_OF_FILE) - { - Disposition = 1; - Status = ZwSetInformationFile(Migrate, - &IoStatusBlock, - &Disposition, - sizeof(Disposition), - FileDispositionInformation); - } - - /* Migration is over */ - Cleanup: - if (TmpBuffer) - { - FreePool(TmpBuffer); - } - - if (DatabaseFile.Buffer) - { - FreePool(DatabaseFile.Buffer); - } - if (DatabaseName.Buffer) { FreePool(DatabaseName.Buffer); } - if (Migrate) - { - ZwClose(Migrate); - } - if (NT_SUCCESS(Status)) { DeviceInformation->Migrated = 1; } - else if (Database) + else if (Database != 0) { ZwClose(Database); } @@ -1870,15 +1761,14 @@ WorkItem->Database = Database; KeSetEvent(WorkItem->Event, 0, FALSE); -#undef TEMP_BUFFER_SIZE } /* * @implemented */ NTSTATUS -MigrateRemoteDatabase(IN PDEVICE_INFORMATION DeviceInformation, - IN OUT PHANDLE Database) +CreateRemoteDatabase(IN PDEVICE_INFORMATION DeviceInformation, + IN OUT PHANDLE Database) { KEVENT Event; NTSTATUS Status; @@ -1907,7 +1797,7 @@ /* And queue it */ IoQueueWorkItem(WorkItem->WorkItem, - MigrateRemoteDatabaseWorker, + CreateRemoteDatabaseWorker, DelayedWorkQueue, WorkItem); @@ -1960,7 +1850,7 @@ /* Disable hard errors */ PreviousMode = IoSetThreadHardErrorMode(FALSE); - Status = ZwCreateFile(&Database, + Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, @@ -1972,12 +1862,19 @@ (!MigrateDatabase || DeviceInformation->Migrated == 0) ? FILE_OPEN_IF : FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_ALERT, NULL, - 0); + 0, + CreateFileTypeNone, + NULL, + IO_STOP_ON_SYMLINK); + if (Status == STATUS_STOPPED_ON_SYMLINK) + { + DPRINT1("Attempt to exploit CVE-2015-1769. See CORE-10216\n"); + } /* If base it to be migrated and was opened successfully, go ahead */ if (MigrateDatabase && NT_SUCCESS(Status)) { - MigrateRemoteDatabase(DeviceInformation, &Database); + CreateRemoteDatabase(DeviceInformation, &Database); } IoSetThreadHardErrorMode(PreviousMode);

9 years, 3 months

[tfaber] 69294: [BLUE][RTL][VIDEOPRT] - Add missing OBJ_KERNEL_HANDLE CORE-10207

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 19 21:10:11 2015 New Revision: 69294 URL: http://svn.reactos.org/svn/reactos?rev=69294&view=rev Log: [BLUE][RTL][VIDEOPRT] - Add missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/drivers/setup/blue/font.c trunk/reactos/lib/rtl/registry.c trunk/reactos/win32ss/drivers/videoprt/int10.c Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Sat Sep 19 21:10:11 2015 @@ -80,7 +80,7 @@ InitializeObjectAttributes(&ObjectAttributes, &LinkName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=692… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sat Sep 19 21:10:11 2015 @@ -523,7 +523,7 @@ /* Initialize the object attributes */ InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -742,19 +742,21 @@ PAGED_CODE_RTL(); /* Open the thread token */ - Status = ZwOpenThreadToken(NtCurrentThread(), - TOKEN_QUERY, - TRUE, - &TokenHandle); + Status = ZwOpenThreadTokenEx(NtCurrentThread(), + TOKEN_QUERY, + TRUE, + OBJ_KERNEL_HANDLE, + &TokenHandle); if (!NT_SUCCESS(Status)) { /* We failed, is it because we don't have a thread token? */ if (Status != STATUS_NO_TOKEN) return Status; /* It is, so use the process token */ - Status = ZwOpenProcessToken(NtCurrentProcess(), - TOKEN_QUERY, - &TokenHandle); + Status = ZwOpenProcessTokenEx(NtCurrentProcess(), + TOKEN_QUERY, + OBJ_KERNEL_HANDLE, + &TokenHandle); if (!NT_SUCCESS(Status)) return Status; } Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/i… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Sat Sep 19 21:10:11 2015 @@ -58,7 +58,7 @@ /* Open the physical memory section */ InitializeObjectAttributes(&ObjectAttributes, &PhysMemName, - 0, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenSection(&PhysMemHandle,

9 years, 3 months

[pschweitzer] 69293: [PSDK] Define STATUS_STOPPED_ON_SYMLINK

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 19 20:51:20 2015 New Revision: 69293 URL: http://svn.reactos.org/svn/reactos?rev=69293&view=rev Log: [PSDK] Define STATUS_STOPPED_ON_SYMLINK Modified: trunk/reactos/include/psdk/ntstatus.h Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Sat Sep 19 20:51:20 2015 @@ -206,6 +206,7 @@ #define STATUS_REGISTRY_HIVE_RECOVERED ((NTSTATUS)0x8000002A) #define STATUS_DLL_MIGHT_BE_INSECURE ((NTSTATUS)0x8000002B) #define STATUS_DLL_MIGHT_BE_INCOMPATIBLE ((NTSTATUS)0x8000002C) +#define STATUS_STOPPED_ON_SYMLINK ((NTSTATUS)0x8000002D) #define STATUS_DEVICE_REQUIRES_CLEANING ((NTSTATUS)0x80000288) #define STATUS_DEVICE_DOOR_OPEN ((NTSTATUS)0x80000289)

9 years, 3 months

[pschweitzer] 69292: [MOUNTMGR] Implement ReconcileThisDatabaseWithMasterWorker() which was the last missing bit of our MountMgr :-)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 19 20:37:09 2015 New Revision: 69292 URL: http://svn.reactos.org/svn/reactos?rev=69292&view=rev Log: [MOUNTMGR] Implement ReconcileThisDatabaseWithMasterWorker() which was the last missing bit of our MountMgr :-) Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Sat Sep 19 20:37:09 2015 @@ -394,11 +394,750 @@ KeReleaseSemaphore(&(DeviceExtension->RemoteDatabaseLock), IO_NO_INCREMENT, 1, FALSE); } +/* + * @implemented + */ +NTSTATUS +NTAPI +QueryUniqueIdQueryRoutine(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PMOUNTDEV_UNIQUE_ID IntUniqueId; + PMOUNTDEV_UNIQUE_ID * UniqueId; + + UNREFERENCED_PARAMETER(ValueName); + UNREFERENCED_PARAMETER(ValueType); + UNREFERENCED_PARAMETER(EntryContext); + + /* Sanity check */ + if (ValueLength >= 0x10000) + { + return STATUS_SUCCESS; + } + + /* Allocate the Unique ID */ + IntUniqueId = AllocatePool(sizeof(UniqueId) + ValueLength); + if (IntUniqueId) + { + /* Copy data & return */ + IntUniqueId->UniqueIdLength = (USHORT)ValueLength; + RtlCopyMemory(&(IntUniqueId->UniqueId), ValueData, ValueLength); + + UniqueId = Context; + *UniqueId = IntUniqueId; + } + + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +QueryUniqueIdFromMaster(IN PDEVICE_EXTENSION DeviceExtension, + IN PUNICODE_STRING SymbolicName, + OUT PMOUNTDEV_UNIQUE_ID * UniqueId) +{ + NTSTATUS Status; + PDEVICE_INFORMATION DeviceInformation; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + /* Query the unique ID */ + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].QueryRoutine = QueryUniqueIdQueryRoutine; + QueryTable[0].Name = SymbolicName->Buffer; + + *UniqueId = NULL; + RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + DatabasePath, + QueryTable, + UniqueId, + NULL); + /* Unique ID found, no need to go farther */ + if (*UniqueId) + { + return STATUS_SUCCESS; + } + + /* Otherwise, find associate device information */ + Status = FindDeviceInfo(DeviceExtension, SymbolicName, FALSE, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *UniqueId = AllocatePool(DeviceInformation->UniqueId->UniqueIdLength + sizeof(MOUNTDEV_UNIQUE_ID)); + if (!*UniqueId) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return this unique ID (better than nothing) */ + (*UniqueId)->UniqueIdLength = DeviceInformation->UniqueId->UniqueIdLength; + RtlCopyMemory(&((*UniqueId)->UniqueId), &(DeviceInformation->UniqueId->UniqueId), (*UniqueId)->UniqueIdLength); + + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +WriteUniqueIdToMaster(IN PDEVICE_EXTENSION DeviceExtension, + IN PDATABASE_ENTRY DatabaseEntry) +{ + NTSTATUS Status; + PWCHAR SymbolicName; + PLIST_ENTRY NextEntry; + UNICODE_STRING SymbolicString; + PDEVICE_INFORMATION DeviceInformation; + + /* Create symbolic name from database entry */ + SymbolicName = AllocatePool(DatabaseEntry->SymbolicNameLength + sizeof(WCHAR)); + if (!SymbolicName) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(SymbolicName, + (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset), + DatabaseEntry->SymbolicNameLength); + SymbolicName[DatabaseEntry->SymbolicNameLength / sizeof(WCHAR)] = UNICODE_NULL; + + /* Associate the unique ID with the name from remote database */ + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + DatabasePath, + SymbolicName, + REG_BINARY, + (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), + DatabaseEntry->UniqueIdLength); + FreePool(SymbolicName); + + /* Reget symbolic name */ + SymbolicString.Length = DatabaseEntry->SymbolicNameLength; + SymbolicString.MaximumLength = DatabaseEntry->SymbolicNameLength; + SymbolicString.Buffer = (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset); + + /* Find the device using this unique ID */ + for (NextEntry = DeviceExtension->DeviceListHead.Flink; + NextEntry != &(DeviceExtension->DeviceListHead); + NextEntry = NextEntry->Flink) + { + DeviceInformation = CONTAINING_RECORD(NextEntry, + DEVICE_INFORMATION, + DeviceListEntry); + + if (DeviceInformation->UniqueId->UniqueIdLength != DatabaseEntry->UniqueIdLength) + { + continue; + } + + if (RtlCompareMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), + DeviceInformation->UniqueId->UniqueId, + DatabaseEntry->UniqueIdLength) == DatabaseEntry->UniqueIdLength) + { + break; + } + } + + /* If found, create a mount point */ + if (NextEntry != &(DeviceExtension->DeviceListHead)) + { + MountMgrCreatePointWorker(DeviceExtension, &SymbolicString, &(DeviceInformation->DeviceName)); + } + + return Status; +} + +/* + * @implemented + */ VOID NTAPI ReconcileThisDatabaseWithMasterWorker(IN PVOID Parameter) { - UNREFERENCED_PARAMETER(Parameter); + ULONG Offset; + NTSTATUS Status; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PMOUNTDEV_UNIQUE_ID UniqueId; + PDATABASE_ENTRY DatabaseEntry; + HANDLE DatabaseHandle, Handle; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PDEVICE_INFORMATION ListDeviceInfo; + PLIST_ENTRY Entry, EntryInfo, NextEntry; + PASSOCIATED_DEVICE_ENTRY AssociatedDevice; + BOOLEAN HardwareErrors, Restart, FailedFinding; + WCHAR FileNameBuffer[0x8], SymbolicNameBuffer[100]; + UNICODE_STRING ReparseFile, FileName, SymbolicName, VolumeName; + FILE_REPARSE_POINT_INFORMATION ReparsePointInformation, SavedReparsePointInformation; + PDEVICE_EXTENSION DeviceExtension = ((PRECONCILE_WORK_ITEM_CONTEXT)Parameter)->DeviceExtension; + PDEVICE_INFORMATION DeviceInformation = ((PRECONCILE_WORK_ITEM_CONTEXT)Parameter)->DeviceInformation; + + /* We're unloading, do nothing */ + if (Unloading) + { + return; + } + + /* Lock remote DB */ + if (!NT_SUCCESS(WaitForRemoteDatabaseSemaphore(DeviceExtension))) + { + return; + } + + /* Recheck for unloading */ + if (Unloading) + { + goto ReleaseRDS; + } + + /* Find the DB to reconcile */ + KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); + for (Entry = DeviceExtension->DeviceListHead.Flink; + Entry != &DeviceExtension->DeviceListHead; + Entry = Entry->Flink) + { + ListDeviceInfo = CONTAINING_RECORD(Entry, DEVICE_INFORMATION, DeviceListEntry); + if (ListDeviceInfo == DeviceInformation) + { + break; + } + } + + /* If not found, or if removable, bail out */ + if (Entry == &DeviceExtension->DeviceListHead || DeviceInformation->Removable) + { + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + + /* Get our device object */ + Status = IoGetDeviceObjectPointer(&ListDeviceInfo->DeviceName, FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + + if (DeviceObject->Flags & 1) + { + _InterlockedExchangeAdd(&ListDeviceInfo->MountState, 1u); + } + + ObDereferenceObject(FileObject); + + /* Force default: no DB, and need for reconcile */ + DeviceInformation->NeedsReconcile = TRUE; + DeviceInformation->NoDatabase = TRUE; + FailedFinding = FALSE; + + /* Remove any associated device that refers to the DB to reconcile */ + for (Entry = DeviceExtension->DeviceListHead.Flink; + Entry != &DeviceExtension->DeviceListHead; + Entry = Entry->Flink) + { + ListDeviceInfo = CONTAINING_RECORD(Entry, DEVICE_INFORMATION, DeviceListEntry); + + EntryInfo = ListDeviceInfo->AssociatedDevicesHead.Flink; + while (EntryInfo != &ListDeviceInfo->AssociatedDevicesHead) + { + AssociatedDevice = CONTAINING_RECORD(EntryInfo, ASSOCIATED_DEVICE_ENTRY, AssociatedDevicesEntry); + NextEntry = EntryInfo->Flink; + + if (AssociatedDevice->DeviceInformation == DeviceInformation) + { + RemoveEntryList(&AssociatedDevice->AssociatedDevicesEntry); + FreePool(AssociatedDevice->String.Buffer); + FreePool(AssociatedDevice); + } + + EntryInfo = NextEntry; + } + } + + /* Open the remote database */ + DatabaseHandle = OpenRemoteDatabase(DeviceInformation, FALSE); + + /* Prepare a string with reparse point index */ + ReparseFile.Length = DeviceInformation->DeviceName.Length + ReparseIndex.Length; + ReparseFile.MaximumLength = ReparseFile.Length + sizeof(UNICODE_NULL); + ReparseFile.Buffer = AllocatePool(ReparseFile.MaximumLength); + if (ReparseFile.Buffer == NULL) + { + if (DatabaseHandle != 0) + { + CloseRemoteDatabase(DatabaseHandle); + } + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + + + RtlCopyMemory(ReparseFile.Buffer, DeviceInformation->DeviceName.Buffer, + DeviceInformation->DeviceName.Length); + RtlCopyMemory((PVOID)((ULONG_PTR)ReparseFile.Buffer + DeviceInformation->DeviceName.Length), + ReparseFile.Buffer, ReparseFile.Length); + ReparseFile.Buffer[ReparseFile.Length / sizeof(WCHAR)] = UNICODE_NULL; + + InitializeObjectAttributes(&ObjectAttributes, + &ReparseFile, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open reparse point directory */ + HardwareErrors = IoSetThreadHardErrorMode(FALSE); + Status = ZwOpenFile(&Handle, + FILE_GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_ALERT); + IoSetThreadHardErrorMode(HardwareErrors); + + FreePool(ReparseFile.Buffer); + + if (!NT_SUCCESS(Status)) + { + if (DatabaseHandle != 0) + { + TruncateRemoteDatabase(DatabaseHandle, 0); + CloseRemoteDatabase(DatabaseHandle); + } + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + + /* Query reparse point information + * We only pay attention to mout point + */ + RtlZeroMemory(FileNameBuffer, sizeof(FileNameBuffer)); + FileName.Buffer = FileNameBuffer; + FileName.Length = sizeof(FileNameBuffer); + FileName.MaximumLength = sizeof(FileNameBuffer); + ((PULONG)FileNameBuffer)[0] = IO_REPARSE_TAG_MOUNT_POINT; + Status = ZwQueryDirectoryFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &ReparsePointInformation, + sizeof(FILE_REPARSE_POINT_INFORMATION), + FileReparsePointInformation, + TRUE, + &FileName, + FALSE); + if (!NT_SUCCESS(Status)) + { + ZwClose(Handle); + if (DatabaseHandle != 0) + { + TruncateRemoteDatabase(DatabaseHandle, 0); + CloseRemoteDatabase(DatabaseHandle); + } + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + + /* If we failed to open the remote DB previously, + * retry this time allowing migration (and thus, creation if required) + */ + if (DatabaseHandle == 0) + { + DatabaseHandle = OpenRemoteDatabase(DeviceInformation, TRUE); + if (DatabaseHandle == 0) + { + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto ReleaseRDS; + } + } + + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + + /* Reset all the references to our DB entries */ + Offset = 0; + for (;;) + { + DatabaseEntry = GetRemoteDatabaseEntry(DatabaseHandle, Offset); + if (DatabaseEntry == NULL) + { + break; + } + + DatabaseEntry->EntryReferences = 0; + Status = WriteRemoteDatabaseEntry(DatabaseHandle, Offset, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + FreePool(DatabaseEntry); + goto CloseReparse; + } + + Offset += DatabaseEntry->EntrySize; + FreePool(DatabaseEntry); + } + + /* Init string for QueryVolumeName call */ + SymbolicName.MaximumLength = sizeof(SymbolicNameBuffer); + SymbolicName.Length = 0; + SymbolicName.Buffer = SymbolicNameBuffer; + Restart = TRUE; + + /* Start looping on reparse points */ + for (;;) + { + RtlCopyMemory(&SavedReparsePointInformation, &ReparsePointInformation, sizeof(FILE_REPARSE_POINT_INFORMATION)); + Status = ZwQueryDirectoryFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &ReparsePointInformation, + sizeof(FILE_REPARSE_POINT_INFORMATION), + FileReparsePointInformation, + TRUE, + Restart ? &FileName : NULL, + Restart); + /* Restart only once */ + if (Restart) + { + Restart = FALSE; + } + else + { + /* If we get the same one, we're done, bail out */ + if (ReparsePointInformation.FileReference == SavedReparsePointInformation.FileReference && + ReparsePointInformation.Tag == SavedReparsePointInformation.Tag) + { + break; + } + } + + /* If querying failed, or if onloading, or if not returning mount points, bail out */ + if (!NT_SUCCESS(Status) || Unloading || ReparsePointInformation.Tag != IO_REPARSE_TAG_MOUNT_POINT) + { + break; + } + + /* Get the volume name associated to the mount point */ + Status = QueryVolumeName(Handle, &ReparsePointInformation, 0, &SymbolicName, &VolumeName); + if (!NT_SUCCESS(Status)) + { + continue; + } + + /* Browse the DB to find the name */ + Offset = 0; + for (;;) + { + UNICODE_STRING DbName; + + DatabaseEntry = GetRemoteDatabaseEntry(DatabaseHandle, Offset); + if (DatabaseEntry == NULL) + { + break; + } + + DbName.MaximumLength = DatabaseEntry->SymbolicNameLength; + DbName.Length = DbName.MaximumLength; + DbName.Buffer = (PWSTR)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset); + /* Found, we're done! */ + if (RtlEqualUnicodeString(&DbName, &SymbolicName, TRUE)) + { + break; + } + + Offset += DatabaseEntry->EntrySize; + FreePool(DatabaseEntry); + } + + /* If we found the mount point.... */ + if (DatabaseEntry != NULL) + { + /* If it was referenced, reference it once more and update to remote */ + if (DatabaseEntry->EntryReferences) + { + ++DatabaseEntry->EntryReferences; + Status = WriteRemoteDatabaseEntry(DatabaseHandle, Offset, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto FreeDBEntry; + } + + FreePool(DatabaseEntry); + } + else + { + /* Query the Unique ID associated to that mount point in case it changed */ + KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); + Status = QueryUniqueIdFromMaster(DeviceExtension, &SymbolicName, &UniqueId); + if (!NT_SUCCESS(Status)) + { + /* If we failed doing so, reuse the old Unique ID and push it to master */ + Status = WriteUniqueIdToMaster(DeviceExtension, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto ReleaseDeviceLock; + } + + /* And then, reference & write the entry */ + ++DatabaseEntry->EntryReferences; + Status = WriteRemoteDatabaseEntry(DatabaseHandle, Offset, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto ReleaseDeviceLock; + } + + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + FreePool(DatabaseEntry); + } + /* If the Unique ID didn't change */ + else if (UniqueId->UniqueIdLength == DatabaseEntry->UniqueIdLength && + RtlCompareMemory(UniqueId->UniqueId, + (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), + UniqueId->UniqueIdLength) == UniqueId->UniqueIdLength) + { + /* Reference the entry, and update to remote */ + ++DatabaseEntry->EntryReferences; + Status = WriteRemoteDatabaseEntry(DatabaseHandle, Offset, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto FreeUniqueId; + } + + FreePool(UniqueId); + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + FreePool(DatabaseEntry); + } + /* Would, by chance, the Unique ID be present elsewhere? */ + else if (IsUniqueIdPresent(DeviceExtension, DatabaseEntry)) + { + /* Push the ID to master */ + Status = WriteUniqueIdToMaster(DeviceExtension, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto FreeUniqueId; + } + + /* And then, reference & write the entry */ + ++DatabaseEntry->EntryReferences; + Status = WriteRemoteDatabaseEntry(DatabaseHandle, Offset, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + goto FreeUniqueId; + } + + FreePool(UniqueId); + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + FreePool(DatabaseEntry); + } + else + { + /* OK, at that point, we're facing a totally unknown unique ID + * So, get rid of the old entry, and recreate a new one with + * the know unique ID + */ + Status = DeleteRemoteDatabaseEntry(DatabaseHandle, Offset); + if (!NT_SUCCESS(Status)) + { + goto FreeUniqueId; + } + + FreePool(DatabaseEntry); + /* Allocate a new entry big enough */ + DatabaseEntry = AllocatePool(UniqueId->UniqueIdLength + SymbolicName.Length + sizeof(DATABASE_ENTRY)); + if (DatabaseEntry == NULL) + { + goto FreeUniqueId; + } + + /* Configure it */ + DatabaseEntry->EntrySize = UniqueId->UniqueIdLength + SymbolicName.Length + sizeof(DATABASE_ENTRY); + DatabaseEntry->EntryReferences = 1; + DatabaseEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); + DatabaseEntry->SymbolicNameLength = SymbolicName.Length; + DatabaseEntry->UniqueIdOffset = SymbolicName.Length + sizeof(DATABASE_ENTRY); + DatabaseEntry->UniqueIdLength = UniqueId->UniqueIdLength; + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset), SymbolicName.Buffer, DatabaseEntry->SymbolicNameLength); + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), UniqueId->UniqueId, UniqueId->UniqueIdLength); + + /* And write it remotely */ + Status = AddRemoteDatabaseEntry(DatabaseHandle, DatabaseEntry); + if (!NT_SUCCESS(Status)) + { + FreePool(DatabaseEntry); + goto FreeUniqueId; + } + + FreePool(UniqueId); + FreePool(DatabaseEntry); + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + } + } + } + else + { + /* We failed finding it remotely + * So, let's allocate a new remote DB entry + */ + KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); + /* To be able to do so, we need the device Unique ID, ask master */ + Status = QueryUniqueIdFromMaster(DeviceExtension, &SymbolicName, &UniqueId); + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + if (NT_SUCCESS(Status)) + { + /* Allocate a new entry big enough */ + DatabaseEntry = AllocatePool(UniqueId->UniqueIdLength + SymbolicName.Length + sizeof(DATABASE_ENTRY)); + if (DatabaseEntry != NULL) + { + /* Configure it */ + DatabaseEntry->EntrySize = UniqueId->UniqueIdLength + SymbolicName.Length + sizeof(DATABASE_ENTRY); + DatabaseEntry->EntryReferences = 1; + DatabaseEntry->SymbolicNameOffset = sizeof(DATABASE_ENTRY); + DatabaseEntry->SymbolicNameLength = SymbolicName.Length; + DatabaseEntry->UniqueIdOffset = SymbolicName.Length + sizeof(DATABASE_ENTRY); + DatabaseEntry->UniqueIdLength = UniqueId->UniqueIdLength; + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset), SymbolicName.Buffer, DatabaseEntry->SymbolicNameLength); + RtlCopyMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), UniqueId->UniqueId, UniqueId->UniqueIdLength); + + /* And write it remotely */ + Status = AddRemoteDatabaseEntry(DatabaseHandle, DatabaseEntry); + FreePool(DatabaseEntry); + FreePool(UniqueId); + + if (!NT_SUCCESS(Status)) + { + goto FreeVolume; + } + } + else + { + FreePool(UniqueId); + } + } + } + + /* Find info about the device associated associated with the mount point */ + KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); + Status = FindDeviceInfo(DeviceExtension, &SymbolicName, FALSE, &ListDeviceInfo); + if (!NT_SUCCESS(Status)) + { + FailedFinding = TRUE; + FreePool(VolumeName.Buffer); + } + else + { + /* Associate the device with the currrent DB */ + AssociatedDevice = AllocatePool(sizeof(ASSOCIATED_DEVICE_ENTRY)); + if (AssociatedDevice == NULL) + { + FreePool(VolumeName.Buffer); + } + else + { + AssociatedDevice->DeviceInformation = DeviceInformation; + AssociatedDevice->String.Length = VolumeName.Length; + AssociatedDevice->String.MaximumLength = VolumeName.MaximumLength; + AssociatedDevice->String.Buffer = VolumeName.Buffer; + InsertTailList(&ListDeviceInfo->AssociatedDevicesHead, &AssociatedDevice->AssociatedDevicesEntry); + } + + /* If we don't have to skip notifications, notify */ + if (!ListDeviceInfo->SkipNotifications) + { + PostOnlineNotification(DeviceExtension, &ListDeviceInfo->SymbolicName); + } + } + + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + } + + /* We don't need mount points any longer */ + ZwClose(Handle); + + /* Look for the DB again */ + KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); + for (Entry = DeviceExtension->DeviceListHead.Flink; + Entry != &DeviceExtension->DeviceListHead; + Entry = Entry->Flink) + { + ListDeviceInfo = CONTAINING_RECORD(Entry, DEVICE_INFORMATION, DeviceListEntry); + if (ListDeviceInfo == DeviceInformation) + { + break; + } + } + + if (Entry == &DeviceExtension->DeviceListHead) + { + ListDeviceInfo = NULL; + } + + /* Start the pruning loop */ + Offset = 0; + for (;;) + { + /* Get the entry */ + DatabaseEntry = GetRemoteDatabaseEntry(DatabaseHandle, Offset); + if (DatabaseEntry == NULL) + { + break; + } + + /* It's not referenced anylonger? Prune it */ + if (DatabaseEntry->EntryReferences == 0) + { + Status = DeleteRemoteDatabaseEntry(DatabaseHandle, Offset); + if (!NT_SUCCESS(Status)) + { + FreePool(DatabaseEntry); + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + goto CloseRDB; + } + } + /* Update the Unique IDs to reflect the changes we might have done previously */ + else + { + if (ListDeviceInfo != NULL) + { + UpdateReplicatedUniqueIds(ListDeviceInfo, DatabaseEntry); + } + + Offset += DatabaseEntry->EntrySize; + } + + FreePool(DatabaseEntry); + } + + /* We do have a DB now :-) */ + if (ListDeviceInfo != NULL && !FailedFinding) + { + DeviceInformation->NoDatabase = FALSE; + } + + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); + + goto CloseRDB; + +FreeUniqueId: + FreePool(UniqueId); +ReleaseDeviceLock: + KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); +FreeDBEntry: + FreePool(DatabaseEntry); +FreeVolume: + FreePool(VolumeName.Buffer); +CloseReparse: + ZwClose(Handle); +CloseRDB: + CloseRemoteDatabase(DatabaseHandle); +ReleaseRDS: + ReleaseRemoteDatabaseSemaphore(DeviceExtension); return; } @@ -1250,165 +1989,6 @@ /* * @implemented */ -NTSTATUS -NTAPI -QueryUniqueIdQueryRoutine(IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext) -{ - PMOUNTDEV_UNIQUE_ID IntUniqueId; - PMOUNTDEV_UNIQUE_ID * UniqueId; - - UNREFERENCED_PARAMETER(ValueName); - UNREFERENCED_PARAMETER(ValueType); - UNREFERENCED_PARAMETER(EntryContext); - - /* Sanity check */ - if (ValueLength >= 0x10000) - { - return STATUS_SUCCESS; - } - - /* Allocate the Unique ID */ - IntUniqueId = AllocatePool(sizeof(UniqueId) + ValueLength); - if (IntUniqueId) - { - /* Copy data & return */ - IntUniqueId->UniqueIdLength = (USHORT)ValueLength; - RtlCopyMemory(&(IntUniqueId->UniqueId), ValueData, ValueLength); - - UniqueId = Context; - *UniqueId = IntUniqueId; - } - - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -QueryUniqueIdFromMaster(IN PDEVICE_EXTENSION DeviceExtension, - IN PUNICODE_STRING SymbolicName, - OUT PMOUNTDEV_UNIQUE_ID * UniqueId) -{ - NTSTATUS Status; - PDEVICE_INFORMATION DeviceInformation; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - - /* Query the unique ID */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].QueryRoutine = QueryUniqueIdQueryRoutine; - QueryTable[0].Name = SymbolicName->Buffer; - - *UniqueId = NULL; - RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - DatabasePath, - QueryTable, - UniqueId, - NULL); - /* Unique ID found, no need to go farther */ - if (*UniqueId) - { - return STATUS_SUCCESS; - } - - /* Otherwise, find associate device information */ - Status = FindDeviceInfo(DeviceExtension, SymbolicName, FALSE, &DeviceInformation); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - *UniqueId = AllocatePool(DeviceInformation->UniqueId->UniqueIdLength + sizeof(MOUNTDEV_UNIQUE_ID)); - if (!*UniqueId) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Return this unique ID (better than nothing) */ - (*UniqueId)->UniqueIdLength = DeviceInformation->UniqueId->UniqueIdLength; - RtlCopyMemory(&((*UniqueId)->UniqueId), &(DeviceInformation->UniqueId->UniqueId), (*UniqueId)->UniqueIdLength); - - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -WriteUniqueIdToMaster(IN PDEVICE_EXTENSION DeviceExtension, - IN PDATABASE_ENTRY DatabaseEntry) -{ - NTSTATUS Status; - PWCHAR SymbolicName; - PLIST_ENTRY NextEntry; - UNICODE_STRING SymbolicString; - PDEVICE_INFORMATION DeviceInformation; - - /* Create symbolic name from database entry */ - SymbolicName = AllocatePool(DatabaseEntry->SymbolicNameLength + sizeof(WCHAR)); - if (!SymbolicName) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(SymbolicName, - (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset), - DatabaseEntry->SymbolicNameLength); - SymbolicName[DatabaseEntry->SymbolicNameLength / sizeof(WCHAR)] = UNICODE_NULL; - - /* Associate the unique ID with the name from remote database */ - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - DatabasePath, - SymbolicName, - REG_BINARY, - (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), - DatabaseEntry->UniqueIdLength); - FreePool(SymbolicName); - - /* Reget symbolic name */ - SymbolicString.Length = DatabaseEntry->SymbolicNameLength; - SymbolicString.MaximumLength = DatabaseEntry->SymbolicNameLength; - SymbolicString.Buffer = (PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->SymbolicNameOffset); - - /* Find the device using this unique ID */ - for (NextEntry = DeviceExtension->DeviceListHead.Flink; - NextEntry != &(DeviceExtension->DeviceListHead); - NextEntry = NextEntry->Flink) - { - DeviceInformation = CONTAINING_RECORD(NextEntry, - DEVICE_INFORMATION, - DeviceListEntry); - - if (DeviceInformation->UniqueId->UniqueIdLength != DatabaseEntry->UniqueIdLength) - { - continue; - } - - if (RtlCompareMemory((PVOID)((ULONG_PTR)DatabaseEntry + DatabaseEntry->UniqueIdOffset), - DeviceInformation->UniqueId->UniqueId, - DatabaseEntry->UniqueIdLength) == DatabaseEntry->UniqueIdLength) - { - break; - } - } - - /* If found, create a mount point */ - if (NextEntry != &(DeviceExtension->DeviceListHead)) - { - MountMgrCreatePointWorker(DeviceExtension, &SymbolicString, &(DeviceInformation->DeviceName)); - } - - return Status; -} - -/* - * @implemented - */ VOID ChangeRemoteDatabaseUniqueId(IN PDEVICE_INFORMATION DeviceInformation, IN PMOUNTDEV_UNIQUE_ID OldUniqueId, Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sat Sep 19 20:37:09 2015 @@ -420,6 +420,18 @@ IN PMOUNTDEV_UNIQUE_ID UniqueId ); +VOID +UpdateReplicatedUniqueIds( + IN PDEVICE_INFORMATION DeviceInformation, + IN PDATABASE_ENTRY DatabaseEntry +); + +BOOLEAN +IsUniqueIdPresent( + IN PDEVICE_EXTENSION DeviceExtension, + IN PDATABASE_ENTRY DatabaseEntry +); + /* point.c */ NTSTATUS MountMgrCreatePointWorker( Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sat Sep 19 20:37:09 2015 @@ -42,11 +42,6 @@ LONG Unloading; static const WCHAR Cunc[] = L"\\??\\C:"; - -/* - * TODO: - * - ReconcileThisDatabaseWithMasterWorker - */ /* * @implemented

9 years, 3 months

[pschweitzer] 69291: [MOUNTMGR] Our ReconcileThisDatabaseWithMasterWorker() routine will expect two parameters: the device extension + the device to which reconcile remote database. So, fix our cod...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 19 14:50:04 2015 New Revision: 69291 URL: http://svn.reactos.org/svn/reactos?rev=69291&view=rev Log: [MOUNTMGR] Our ReconcileThisDatabaseWithMasterWorker() routine will expect two parameters: the device extension + the device to which reconcile remote database. So, fix our code accordingly Modified: trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Sat Sep 19 14:50:04 2015 @@ -1467,6 +1467,7 @@ ULONG Attempts, OutputLength; PMOUNTMGR_TARGET_NAME Target; PMOUNTMGR_VOLUME_PATHS Paths, Output; + RECONCILE_WORK_ITEM_CONTEXT ReconcileContext; PDEVICE_INFORMATION DeviceInformation, ListDeviceInfo, FailedDevice; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -1535,8 +1536,10 @@ } /* Reconcile database */ + ReconcileContext.DeviceExtension = DeviceExtension; + ReconcileContext.DeviceInformation = FailedDevice; KeReleaseSemaphore(&DeviceExtension->DeviceLock, IO_NO_INCREMENT, 1, FALSE); - ReconcileThisDatabaseWithMasterWorker(&DeviceExtension); + ReconcileThisDatabaseWithMasterWorker(&ReconcileContext); KeWaitForSingleObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); /* Look for our device, to check it's online */ Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sat Sep 19 14:50:04 2015 @@ -128,14 +128,19 @@ UNICODE_STRING SymbolicName; // 0x14 } ONLINE_NOTIFICATION_WORK_ITEM, *PONLINE_NOTIFICATION_WORK_ITEM; // 0x1C +typedef struct _RECONCILE_WORK_ITEM_CONTEXT +{ + PDEVICE_EXTENSION DeviceExtension; + PDEVICE_INFORMATION DeviceInformation; +} RECONCILE_WORK_ITEM_CONTEXT, *PRECONCILE_WORK_ITEM_CONTEXT; + typedef struct _RECONCILE_WORK_ITEM { LIST_ENTRY WorkerQueueListEntry; // 0x00 PIO_WORKITEM WorkItem; // 0x08 PWORKER_THREAD_ROUTINE WorkerRoutine; // 0x0C PVOID Context; // 0x10 - PDEVICE_EXTENSION DeviceExtension; // 0x14 - PDEVICE_INFORMATION DeviceInformation; // 0x18 + RECONCILE_WORK_ITEM_CONTEXT; // 0x14 } RECONCILE_WORK_ITEM, *PRECONCILE_WORK_ITEM; // 0x1C typedef struct _MIGRATE_WORK_ITEM

9 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015