Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[spetreolle] 69884: [UMPNPMGR] Improve traces.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Nov 14 13:28:03 2015 New Revision: 69884 URL: http://svn.reactos.org/svn/reactos?rev=69884&view=rev Log: [UMPNPMGR] Improve traces. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Nov 14 13:28:03 2015 @@ -1930,7 +1930,7 @@ CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; - DPRINT("Enable device instance\n"); + DPRINT("Enable device instance %S\n", pszDeviceInstance); RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance); Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); @@ -3167,7 +3167,7 @@ WCHAR PipeName[74]; WCHAR UuidString[39]; - DPRINT1("InstallDevice(%S, %d)\n", DeviceInstance, ShowWizard); + DPRINT("InstallDevice(%S, %d)\n", DeviceInstance, ShowWizard); ZeroMemory(&ProcessInfo, sizeof(ProcessInfo));

8 years, 10 months

[tfaber] 69883: [NTOS:KD] - Actually write back the response to the user buffer in KdpPrompt

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 14 08:55:46 2015 New Revision: 69883 URL: http://svn.reactos.org/svn/reactos?rev=69883&view=rev Log: [NTOS:KD] - Actually write back the response to the user buffer in KdpPrompt Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Sat Nov 14 08:55:46 2015 @@ -212,7 +212,7 @@ NTAPI KdpPrompt(IN LPSTR PromptString, IN USHORT PromptLength, - OUT LPSTR ResponseString, + OUT PCHAR ResponseString, IN USHORT MaximumResponseLength, IN KPROCESSOR_MODE PreviousMode, IN PKTRAP_FRAME TrapFrame, @@ -220,7 +220,8 @@ { STRING PromptBuffer, ResponseBuffer; BOOLEAN Enable, Resend; - PVOID CapturedPrompt, CapturedResponse; + PVOID CapturedPrompt; + PCHAR SafeResponseString; /* Normalize the lengths */ PromptLength = min(PromptLength, @@ -250,8 +251,7 @@ ProbeForWrite(ResponseString, MaximumResponseLength, 1); - CapturedResponse = _alloca(MaximumResponseLength); - ResponseString = CapturedResponse; + SafeResponseString = _alloca(MaximumResponseLength); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -259,12 +259,16 @@ _SEH2_YIELD(return 0); } _SEH2_END; + } + else + { + SafeResponseString = ResponseString; } /* Setup the prompt and response buffers */ PromptBuffer.Buffer = PromptString; PromptBuffer.Length = PromptLength; - ResponseBuffer.Buffer = ResponseString; + ResponseBuffer.Buffer = SafeResponseString; ResponseBuffer.Length = 0; ResponseBuffer.MaximumLength = MaximumResponseLength;

8 years, 10 months

[hbelusca] 69882: Fix cast type.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 13 20:01:53 2015 New Revision: 69882 URL: http://svn.reactos.org/svn/reactos?rev=69882&view=rev Log: Fix cast type. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Fri Nov 13 20:01:53 2015 @@ -172,7 +172,7 @@ PCSR_PROCESS CsrProcess; DPRINT1("CsrConnectToUser being called; 0x%p [0x%x, 0x%x]...\n", - CurrThread, (CurrThread ? CurrThread->ClientId.UniqueProcess : (ULONG_PTR)-1), (CurrThread ? CurrThread->ClientId.UniqueThread : (ULONG_PTR)-1)); + CurrThread, (CurrThread ? CurrThread->ClientId.UniqueProcess : (HANDLE)-1), (CurrThread ? CurrThread->ClientId.UniqueThread : (HANDLE)-1)); pcsrt = CsrConnectToUser(); if (pcsrt == NULL) goto Quit;

8 years, 10 months

[hbelusca] 69881: [CSRSRV][CONSRV][USERSRV]: Display complementary redundant information to try to understand problems in CORE-9742 and CORE-10510 (any discrepancy in the redundant info should be t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 13 19:56:22 2015 New Revision: 69881 URL: http://svn.reactos.org/svn/reactos?rev=69881&view=rev Log: [CSRSRV][CONSRV][USERSRV]: Display complementary redundant information to try to understand problems in CORE-9742 and CORE-10510 (any discrepancy in the redundant info should be the sign of some corruption). Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Fri Nov 13 19:56:22 2015 @@ -440,8 +440,10 @@ Status = NtClose(CsrThread->ThreadHandle); if (!NT_SUCCESS(Status)) - DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [0x%x, 0x%x] Process: 0x%p; ThreadHandle: 0x%p\n", - Status, CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread, CsrProcess, CsrThread->ThreadHandle); + DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; P:[0x%x, 0x%x] T:[0x%x, 0x%x] Process: 0x%p; Thread: 0x%p; ThreadHandle: 0x%p\n", + Status, CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread, + CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread, + CsrProcess, CsrThread, CsrThread->ThreadHandle); ASSERT(NT_SUCCESS(Status)); } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Fri Nov 13 19:56:22 2015 @@ -169,17 +169,23 @@ /* Connect this CSR thread to the USER subsystem */ { PCSR_THREAD CurrThread = CsrGetClientThread(); - - DPRINT1("CsrConnectToUser being called; [0x%x, 0x%x]...\n", - CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread); + PCSR_PROCESS CsrProcess; + + DPRINT1("CsrConnectToUser being called; 0x%p [0x%x, 0x%x]...\n", + CurrThread, (CurrThread ? CurrThread->ClientId.UniqueProcess : (ULONG_PTR)-1), (CurrThread ? CurrThread->ClientId.UniqueThread : (ULONG_PTR)-1)); pcsrt = CsrConnectToUser(); if (pcsrt == NULL) goto Quit; hThread = pcsrt->ThreadHandle; - DPRINT1("CsrConnectToUser was successfully called; [0x%x, 0x%x] -- hThread = 0x%p, pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n", + CurrThread = CsrGetClientThread(); + CsrProcess = CurrThread->Process; + + DPRINT1("CsrConnectToUser was successfully called; P:[0x%x, 0x%x] T:[0x%x, 0x%x] Process: 0x%p; Thread: 0x%p -- hThread = 0x%p, pcsrt = 0x%p; pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n", + CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread, CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread, - hThread, pcsrt->Process, pcsrt->ThreadHandle, + CsrProcess, CurrThread, + hThread, pcsrt, pcsrt->Process, pcsrt->ThreadHandle, pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread); } Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Fri Nov 13 19:56:22 2015 @@ -755,8 +755,9 @@ IN ULONG Flags, IN BOOLEAN FirstPhase) { - DPRINT1("UserClientShutdown(0x%p, 0x%x, %s)\n", - CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase"); + DPRINT1("UserClientShutdown(0x%p, 0x%x, %s) - [0x%x, 0x%x]\n", + CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", + CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); /* * Check for process validity

8 years, 10 months

[ekohl] 69880: [FASTFAT] Deny access when trying to overwrite a read-only file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Nov 13 19:03:34 2015 New Revision: 69880 URL: http://svn.reactos.org/svn/reactos?rev=69880&view=rev Log: [FASTFAT] Deny access when trying to overwrite a read-only file. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Nov 13 19:03:34 2015 @@ -411,7 +411,8 @@ /* Fail, if we try to overwrite a read-only file */ if ((*Fcb->Attributes & FILE_ATTRIBUTE_READONLY) && - (RequestedDisposition == FILE_OVERWRITE)) + (RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF)) { vfatReleaseFCB(DeviceExt, Fcb); return STATUS_ACCESS_DENIED; @@ -580,6 +581,8 @@ if (!OpenTargetDir) { Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, &ParentFcb); + if (Status == STATUS_ACCESS_DENIED) + return Status; } else {

8 years, 10 months

[hbelusca] 69879: [CONSRV] Add diagnostic dprints to try to understand the problems described in CORE-9742 and CORE-10510

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Nov 12 20:24:18 2015 New Revision: 69879 URL: http://svn.reactos.org/svn/reactos?rev=69879&view=rev Log: [CONSRV] Add diagnostic dprints to try to understand the problems described in CORE-9742 and CORE-10510 Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Thu Nov 12 20:24:18 2015 @@ -440,7 +440,7 @@ Status = NtClose(CsrThread->ThreadHandle); if (!NT_SUCCESS(Status)) - DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [%02x,%02x] Process: 0x%p; ThreadHandle: 0x%p\n", + DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [0x%x, 0x%x] Process: 0x%p; ThreadHandle: 0x%p\n", Status, CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread, CsrProcess, CsrThread->ThreadHandle); ASSERT(NT_SUCCESS(Status)); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Thu Nov 12 20:24:18 2015 @@ -147,6 +147,7 @@ PGUI_INIT_INFO GuiInitInfo = (PGUI_INIT_INFO)Param; DESKTOP_CONSOLE_THREAD DesktopConsoleThreadInfo; ULONG_PTR InputThreadId = HandleToUlong(NtCurrentTeb()->ClientId.UniqueThread); + HANDLE hThread = NULL; LONG WindowCount = 0; MSG msg; @@ -166,8 +167,21 @@ if (!NT_SUCCESS(Status)) goto Quit; /* Connect this CSR thread to the USER subsystem */ + { + PCSR_THREAD CurrThread = CsrGetClientThread(); + + DPRINT1("CsrConnectToUser being called; [0x%x, 0x%x]...\n", + CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread); + pcsrt = CsrConnectToUser(); if (pcsrt == NULL) goto Quit; + hThread = pcsrt->ThreadHandle; + + DPRINT1("CsrConnectToUser was successfully called; [0x%x, 0x%x] -- hThread = 0x%p, pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n", + CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread, + hThread, pcsrt->Process, pcsrt->ThreadHandle, + pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread); + } /* Assign the desktop to this thread */ if (!SetThreadDesktop(DesktopConsoleThreadInfo.DesktopHandle)) goto Quit; @@ -307,7 +321,20 @@ CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop /* Cleanup CSR thread */ - if (pcsrt) CsrDereferenceThread(pcsrt); + if (pcsrt) + { + PCSR_THREAD CurrThread = CsrGetClientThread(); + + DPRINT1("CsrDereferenceThread being called; [0x%x, 0x%x] -- hThread = 0x%p, pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n", + CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread, + hThread, pcsrt->Process, pcsrt->ThreadHandle, + pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread); + + if (hThread != pcsrt->ThreadHandle) + DPRINT1("WARNING!! hThread != pcsrt->ThreadHandle, you may expect crashes soon!!\n"); + + CsrDereferenceThread(pcsrt); + } /* Exit the thread */ RtlExitUserThread(Status);

8 years, 10 months

[tfaber] 69878: [KMTESTS:IO] - Add a test trying assorted path variations to open files CORE-10483

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 12 13:13:54 2015 New Revision: 69878 URL: http://svn.reactos.org/svn/reactos?rev=69878&view=rev Log: [KMTESTS:IO] - Add a test trying assorted path variations to open files CORE-10483 Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoFilesys… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] Thu Nov 12 13:13:54 2015 @@ -8,6 +8,275 @@ #include <kmt_test.h> /* FIXME: Test this stuff on non-FAT volumes */ + +static +VOID +Substitute( + _Out_writes_bytes_(BufferSize) PWCHAR Buffer, + _In_ ULONG BufferSize, + _In_ PCWSTR Template, + _In_ PCWSTR SystemDriveName, + _In_ PCWSTR SystemRootName) +{ + UNICODE_STRING SystemDriveTemplate = RTL_CONSTANT_STRING(L"C:"); + UNICODE_STRING SystemRootTemplate = RTL_CONSTANT_STRING(L"ReactOS"); + ULONG SystemDriveLength; + ULONG SystemRootLength; + PWCHAR Dest = Buffer; + UNICODE_STRING String; + + SystemDriveLength = wcslen(SystemDriveName) * sizeof(WCHAR); + SystemRootLength = wcslen(SystemRootName) * sizeof(WCHAR); + + RtlInitUnicodeString(&String, Template); + ASSERT(String.Length % sizeof(WCHAR) == 0); + while (String.Length) + { + if (RtlPrefixUnicodeString(&SystemDriveTemplate, &String, TRUE)) + { + ASSERT((Dest - Buffer) * sizeof(WCHAR) + SystemDriveLength < BufferSize); + RtlCopyMemory(Dest, + SystemDriveName, + SystemDriveLength); + Dest += SystemDriveLength / sizeof(WCHAR); + + String.Buffer += SystemDriveTemplate.Length / sizeof(WCHAR); + String.Length -= SystemDriveTemplate.Length; + String.MaximumLength -= SystemDriveTemplate.Length; + continue; + } + + if (RtlPrefixUnicodeString(&SystemRootTemplate, &String, TRUE)) + { + ASSERT((Dest - Buffer) * sizeof(WCHAR) + SystemRootLength < BufferSize); + RtlCopyMemory(Dest, + SystemRootName, + SystemRootLength); + Dest += SystemRootLength / sizeof(WCHAR); + + String.Buffer += SystemRootTemplate.Length / sizeof(WCHAR); + String.Length -= SystemRootTemplate.Length; + String.MaximumLength -= SystemRootTemplate.Length; + continue; + } + + ASSERT(Dest - Buffer < BufferSize / sizeof(WCHAR)); + *Dest++ = String.Buffer[0]; + + String.Buffer++; + String.Length -= sizeof(WCHAR); + String.MaximumLength -= sizeof(WCHAR); + } + ASSERT(Dest - Buffer < BufferSize / sizeof(WCHAR)); + *Dest = UNICODE_NULL; +} + +static +VOID +TestRelativeNames(VOID) +{ + NTSTATUS Status; + struct + { + PCWSTR ParentPathTemplate; + PCWSTR RelativePathTemplate; + BOOLEAN IsDirectory; + NTSTATUS Status; + } Tests[] = + { + { NULL, L"C:\\", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\\\", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\ReactOS", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\ReactOS\\", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\ReactOS\\\\", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\ReactOS\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\\\ReactOS", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\\\ReactOS\\", TRUE, STATUS_SUCCESS }, + { NULL, L"C:\\ReactOS\\explorer.exe", FALSE, STATUS_SUCCESS }, + { NULL, L"C:\\ReactOS\\\\explorer.exe", FALSE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\ReactOS\\explorer.exe\\", FALSE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\ReactOS\\explorer.exe\\\\", FALSE, STATUS_OBJECT_NAME_INVALID }, + /* This will never return STATUS_NOT_A_DIRECTORY. IsDirectory=TRUE is a little hacky but achieves that without special handling */ + { NULL, L"C:\\ReactOS\\explorer.exe\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"C:\\", L"", TRUE, STATUS_SUCCESS }, + { L"C:\\", L"\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"C:\\", L"ReactOS", TRUE, STATUS_SUCCESS }, + { L"C:\\", L"\\ReactOS", TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"C:\\", L"ReactOS\\", TRUE, STATUS_SUCCESS }, + { L"C:\\", L"\\ReactOS\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"C:\\ReactOS", L"", TRUE, STATUS_SUCCESS }, + { L"C:\\ReactOS", L"explorer.exe", FALSE, STATUS_SUCCESS }, + { L"C:\\ReactOS\\explorer.exe", L"", FALSE, STATUS_SUCCESS }, + /* Let's try some nonexistent things */ + { NULL, L"C:\\ReactOS\\IDoNotExist", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\IDoNotExist\\file", FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\IDoNotExist\\file?", FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\IDoNotExist\\file\\\\",TRUE,STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\IDoNotExist\\file\\\\\\",TRUE,STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\AmIInvalid?", FALSE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\ReactOS\\.", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L".", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L"..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L"...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L".", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L"..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L"...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + }; + ULONG i; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatus; + UNICODE_STRING ParentPath; + UNICODE_STRING RelativePath; + HANDLE ParentHandle; + HANDLE FileHandle; + UNICODE_STRING SystemRoot = RTL_CONSTANT_STRING(L"\\SystemRoot"); + HANDLE SymbolicLinkHandle = NULL; + WCHAR LinkNameBuffer[128]; + UNICODE_STRING SymbolicLinkName; + PWSTR SystemDriveName; + PWSTR SystemRootName; + PWCHAR Buffer = NULL; + BOOLEAN TrailingBackslash; + + /* Query \SystemRoot */ + InitializeObjectAttributes(&ObjectAttributes, + &SystemRoot, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&SymbolicLinkHandle, + GENERIC_READ, + &ObjectAttributes); + if (skip(NT_SUCCESS(Status), "Failed to open SystemRoot, %lx\n", Status)) + return; + + RtlInitEmptyUnicodeString(&SymbolicLinkName, + LinkNameBuffer, + sizeof(LinkNameBuffer)); + Status = ZwQuerySymbolicLinkObject(SymbolicLinkHandle, + &SymbolicLinkName, + NULL); + ObCloseHandle(SymbolicLinkHandle, KernelMode); + if (skip(NT_SUCCESS(Status), "Failed to query SystemRoot, %lx\n", Status)) + return; + + /* Split SymbolicLinkName into drive and path */ + SystemDriveName = SymbolicLinkName.Buffer; + SystemRootName = SymbolicLinkName.Buffer + SymbolicLinkName.Length / sizeof(WCHAR); + *SystemRootName-- = UNICODE_NULL; + while (*SystemRootName != L'\\') + { + ASSERT(SystemRootName > SymbolicLinkName.Buffer); + SystemRootName--; + } + *SystemRootName++ = UNICODE_NULL; + trace("System Drive: '%ls'\n", SystemDriveName); + trace("System Root: '%ls'\n", SystemRootName); + + /* Allocate path buffer */ + Buffer = ExAllocatePoolWithTag(PagedPool, MAXUSHORT, 'sFmK'); + if (skip(Buffer != NULL, "No buffer\n")) + return; + + /* Finally run some tests! */ + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + /* Open parent directory first */ + ParentHandle = NULL; + if (Tests[i].ParentPathTemplate) + { + Substitute(Buffer, + MAXUSHORT, + Tests[i].ParentPathTemplate, + SystemDriveName, + SystemRootName); + RtlInitUnicodeString(&ParentPath, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &ParentPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenFile(&ParentHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + ok(Status == STATUS_SUCCESS, + "[%lu] Status = %lx, expected STATUS_SUCCESS\n", i, Status); + if (skip(NT_SUCCESS(Status), "No parent handle %lu\n", i)) + continue; + } + + /* Now open the relative file: */ + Substitute(Buffer, + MAXUSHORT, + Tests[i].RelativePathTemplate, + SystemDriveName, + SystemRootName); + RtlInitUnicodeString(&RelativePath, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &RelativePath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + ParentHandle, + NULL); + TrailingBackslash = FALSE; + if (wcslen(Buffer) && Buffer[wcslen(Buffer) - 1] == L'\\') + TrailingBackslash = TRUE; + + /* (1) No flags */ + Status = ZwOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + ok(Status == Tests[i].Status, + "[%lu] Status = %lx, expected %lx\n", i, Status, Tests[i].Status); + if (NT_SUCCESS(Status)) + ObCloseHandle(FileHandle, KernelMode); + + /* (2) Directory File */ + Status = ZwOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE); + if (Tests[i].IsDirectory || (!TrailingBackslash && !NT_SUCCESS(Tests[i].Status))) + ok(Status == Tests[i].Status, + "[%lu] Status = %lx, expected %lx\n", i, Status, Tests[i].Status); + else + ok(Status == STATUS_NOT_A_DIRECTORY, + "[%lu] Status = %lx, expected STATUS_NOT_A_DIRECTORY\n", i, Status); + if (NT_SUCCESS(Status)) + ObCloseHandle(FileHandle, KernelMode); + + /* (3) Non-Directory File */ + Status = ZwOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE); + if (Tests[i].IsDirectory && NT_SUCCESS(Tests[i].Status)) + ok(Status == STATUS_FILE_IS_A_DIRECTORY, + "[%lu] Status = %lx, expected STATUS_FILE_IS_A_DIRECTORY\n", i, Status); + else + ok(Status == Tests[i].Status, + "[%lu] Status = %lx, expected %lx\n", i, Status, Tests[i].Status); + if (NT_SUCCESS(Status)) + ObCloseHandle(FileHandle, KernelMode); + + /* And close */ + ObCloseHandle(ParentHandle, KernelMode); + } + + ExFreePoolWithTag(Buffer, 'sFmK'); +} static VOID @@ -174,5 +443,6 @@ START_TEST(IoFilesystem) { + TestRelativeNames(); TestSharedCacheMap(); }

8 years, 10 months

[tfaber] 69877: [KMTESTS:IO] - Add a test verifying that opening a file using different parent directories still yields handles to the same file CORE-10483

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Nov 12 12:55:26 2015 New Revision: 69877 URL: http://svn.reactos.org/svn/reactos?rev=69877&view=rev Log: [KMTESTS:IO] - Add a test verifying that opening a file using different parent directories still yields handles to the same file CORE-10483 Added: trunk/rostests/kmtests/ntos_io/IoFilesystem.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Nov 12 12:55:26 2015 @@ -53,6 +53,7 @@ ntos_io/IoCreateFile.c ntos_io/IoDeviceInterface.c ntos_io/IoEvent.c + ntos_io/IoFilesystem.c ntos_io/IoInterrupt.c ntos_io/IoIrp.c ntos_io/IoMdl.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Thu Nov 12 12:55:26 2015 @@ -26,6 +26,7 @@ KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceInterface; KMT_TESTFUNC Test_IoEvent; +KMT_TESTFUNC Test_IoFilesystem; KMT_TESTFUNC Test_IoInterrupt; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; @@ -90,6 +91,7 @@ { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent }, + { "IoFilesystem", Test_IoFilesystem }, { "IoInterrupt", Test_IoInterrupt }, { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, Added: trunk/rostests/kmtests/ntos_io/IoFilesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoFilesys… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoFilesystem.c (added) +++ trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] Thu Nov 12 12:55:26 2015 @@ -0,0 +1,178 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite File System test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +/* FIXME: Test this stuff on non-FAT volumes */ + +static +VOID +TestSharedCacheMap(VOID) +{ + NTSTATUS Status; + struct + { + PCWSTR ParentPath; + PCWSTR RelativePath; + } Tests[] = + { + { 0, L"\\SystemRoot\\system32\\drivers\\etc\\hosts" }, + { L"\\SystemRoot", L"system32\\drivers\\etc\\hosts" }, + { L"\\SystemRoot\\system32", L"drivers\\etc\\hosts" }, + { L"\\SystemRoot\\system32\\drivers", L"etc\\hosts" }, + { L"\\SystemRoot\\system32\\drivers\\etc", L"hosts" }, + }; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatus; + UNICODE_STRING ParentPath; + UNICODE_STRING RelativePath; + HANDLE ParentHandle[RTL_NUMBER_OF(Tests)] = { NULL }; + HANDLE FileHandle[RTL_NUMBER_OF(Tests)] = { NULL }; + PFILE_OBJECT FileObject[RTL_NUMBER_OF(Tests)] = { NULL }; + PFILE_OBJECT SystemRootObject = NULL; + UCHAR Buffer[32]; + HANDLE EventHandle; + LARGE_INTEGER FileOffset; + ULONG i; + + /* We need an event for ZwReadFile */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateEvent(&EventHandle, + SYNCHRONIZE, + &ObjectAttributes, + NotificationEvent, + FALSE); + if (skip(NT_SUCCESS(Status), "No event\n")) + goto Cleanup; + + /* Open all test files and get their FILE_OBJECT pointers */ + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + if (Tests[i].ParentPath) + { + RtlInitUnicodeString(&ParentPath, Tests[i].ParentPath); + InitializeObjectAttributes(&ObjectAttributes, + &ParentPath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenFile(&ParentHandle[i], + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "No parent handle %lu\n", i)) + goto Cleanup; + } + + RtlInitUnicodeString(&RelativePath, Tests[i].RelativePath); + InitializeObjectAttributes(&ObjectAttributes, + &RelativePath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + ParentHandle[i], + NULL); + Status = ZwOpenFile(&FileHandle[i], + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "No file handle %lu\n", i)) + goto Cleanup; + + Status = ObReferenceObjectByHandle(FileHandle[i], + FILE_ALL_ACCESS, + *IoFileObjectType, + KernelMode, + (PVOID*)&FileObject[i], + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "No file object %lu\n", i)) + goto Cleanup; + } + + /* Also get a file object for the SystemRoot directory */ + Status = ObReferenceObjectByHandle(ParentHandle[1], + GENERIC_READ, + *IoFileObjectType, + KernelMode, + (PVOID*)&SystemRootObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "No SystemRoot object\n")) + goto Cleanup; + + /* Before read, caching is not initialized */ + ok_eq_pointer(SystemRootObject->SectionObjectPointer, NULL); + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + ok(FileObject[i]->SectionObjectPointer != NULL, "FileObject[%lu]->SectionObjectPointer = NULL\n", i); + ok(FileObject[i]->SectionObjectPointer == FileObject[0]->SectionObjectPointer, + "FileObject[%lu]->SectionObjectPointer = %p, expected %p\n", + i, FileObject[i]->SectionObjectPointer, FileObject[0]->SectionObjectPointer); + } + if (!skip(FileObject[0]->SectionObjectPointer != NULL, "No section object pointers\n")) + ok_eq_pointer(FileObject[0]->SectionObjectPointer->SharedCacheMap, NULL); + + /* Perform a read on one handle to initialize caching */ + FileOffset.QuadPart = 0; + Status = ZwReadFile(FileHandle[0], + EventHandle, + NULL, + NULL, + &IoStatus, + Buffer, + sizeof(Buffer), + &FileOffset, + NULL); + if (Status == STATUS_PENDING) + { + Status = ZwWaitForSingleObject(EventHandle, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = IoStatus.Status; + } + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Now we see a SharedCacheMap for the file */ + ok_eq_pointer(SystemRootObject->SectionObjectPointer, NULL); + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + ok(FileObject[i]->SectionObjectPointer != NULL, "FileObject[%lu]->SectionObjectPointer = NULL\n", i); + ok(FileObject[i]->SectionObjectPointer == FileObject[0]->SectionObjectPointer, + "FileObject[%lu]->SectionObjectPointer = %p, expected %p\n", + i, FileObject[i]->SectionObjectPointer, FileObject[0]->SectionObjectPointer); + } + if (!skip(FileObject[0]->SectionObjectPointer != NULL, "No section object pointers\n")) + ok(FileObject[0]->SectionObjectPointer->SharedCacheMap != NULL, "SharedCacheMap is NULL\n"); + +Cleanup: + if (SystemRootObject) + ObDereferenceObject(SystemRootObject); + if (EventHandle) + ObCloseHandle(EventHandle, KernelMode); + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + if (FileObject[i]) + ObDereferenceObject(FileObject[i]); + if (FileHandle[i]) + ObCloseHandle(FileHandle[i], KernelMode); + if (ParentHandle[i]) + ObCloseHandle(ParentHandle[i], KernelMode); + } +} + +START_TEST(IoFilesystem) +{ + TestSharedCacheMap(); +} Propchange: trunk/rostests/kmtests/ntos_io/IoFilesystem.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 10 months

[ekohl] 69876: [NTMARTA] AccpGetTrusteeSid: Ignore pMultipleTrustee and MultipleTrusteeOperation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Nov 12 12:30:12 2015 New Revision: 69876 URL: http://svn.reactos.org/svn/reactos?rev=69876&view=rev Log: [NTMARTA] AccpGetTrusteeSid: Ignore pMultipleTrustee and MultipleTrusteeOperation. Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Thu Nov 12 12:30:12 2015 @@ -513,11 +513,14 @@ *ppSid = NULL; *Allocated = FALSE; + /* Windows ignores this */ +#if 0 if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) { /* This is currently not supported */ return ERROR_INVALID_PARAMETER; } +#endif switch (Trustee->TrusteeForm) {

8 years, 10 months

[fireball] 69875: Update trunk's patch wrt recent commit. It starts to get smaller in size, finally.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 10 23:21:30 2015 New Revision: 69875 URL: http://svn.reactos.org/svn/reactos?rev=69875&view=rev Log: Update trunk's patch wrt recent commit. It starts to get smaller in size, finally. Modified: branches/arwinss/trunk.diff Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=69875&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Tue Nov 10 23:21:30 2015 @@ -1,16 +1,3 @@ -Index: base/system/smss/smsubsys.c -=================================================================== ---- base/system/smss/smsubsys.c (revision 69795) -+++ base/system/smss/smsubsys.c (working copy) -@@ -10,7 +10,7 @@ - - #include "smss.h" - --#define NDEBUG -+//#define NDEBUG - #include <debug.h> - - /* GLOBALS ********************************************************************/ Index: base/system/winlogon/winlogon.c =================================================================== --- base/system/winlogon/winlogon.c (revision 69795) @@ -113,6 +100,15 @@ if(!SetThreadDesktop(hDesk)) { +@@ -118,6 +122,8 @@ + + TRACE("GUIDisplayStatusMessage(%ws)\n", pMessage); + ++ ERR("ARWINSS BIG BUG #1\n"); ++return TRUE; // ARWINSS 1st bug + if (!pgContext->hStatusWindow) + { + /* Index: include/asm/syscalls.inc =================================================================== --- include/asm/syscalls.inc (revision 69795) @@ -502,12 +498,7 @@ if (!NT_SUCCESS(Status)) goto Quit; /* Connect this CSR thread to the USER subsystem */ -@@ -295,13 +300,17 @@ - - Quit: - DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); -- -+ +@@ -299,9 +304,13 @@ /* Remove this console input thread from this desktop */ // DesktopConsoleThreadInfo.DesktopHandle; DesktopConsoleThreadInfo.ThreadId = 0; @@ -543,30 +534,7 @@ =================================================================== --- win32ss/user/winsrv/usersrv/init.c (revision 69795) +++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -101,8 +101,22 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); - RtlExitUserThread(0); -+#else -+ DWORD WaitRes; -+ HANDLE hDummyEvent; -+ -+ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); -+ -+ while (TRUE) -+ { -+ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); -+ } -+ DPRINT1("WaitRes: 0x%x\n", WaitRes); -+#endif -+ DPRINT1("This thread should not terminate!\n"); - return 0; - } - -@@ -173,6 +187,7 @@ +@@ -173,6 +173,7 @@ CsrApiPort = CsrQueryApiPort(); /* Inform win32k about the API port */ @@ -574,7 +542,7 @@ Status = NtUserSetInformationThread(NtCurrentThread(), UserThreadCsrApiPort, &CsrApiPort, -@@ -181,6 +196,9 @@ +@@ -181,6 +182,9 @@ { return Status; } @@ -584,7 +552,7 @@ } /* Check connection info validity */ -@@ -199,9 +217,14 @@ +@@ -199,9 +203,14 @@ /* Pass the request to win32k */ ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; @@ -599,7 +567,7 @@ return Status; } -@@ -254,7 +277,11 @@ +@@ -254,7 +263,11 @@ } /* Set the process creation notify routine for BASE */

8 years, 10 months

← Newer
1
...
32
33
34
35
36
37
38
...
46
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 November 2015