Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65465: [WIN32K]: Use the logon process ID instead of a full win32k process object, it simplifies code in some parts.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 16:09:00 2014 New Revision: 65465 URL: http://svn.reactos.org/svn/reactos?rev=65465&view=rev Log: [WIN32K]: Use the logon process ID instead of a full win32k process object, it simplifies code in some parts. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Nov 23 16:09:00 2014 @@ -1701,7 +1701,7 @@ * is the logon application itself */ if((pdesk->rpwinstaParent->Flags & WSS_LOCKED) && - LogonProcess != PsGetCurrentProcessWin32Process()) + gpidLogon != PsGetCurrentProcessId()) { ObDereferenceObject(pdesk); ERR("Switching desktop 0x%p denied because the window station is locked!\n", hdesk); Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Nov 23 16:09:00 2014 @@ -213,10 +213,8 @@ /* * Deregister logon application automatically */ - if(LogonProcess == ppiCurrent) - { - LogonProcess = NULL; - } + if (gpidLogon == ppiCurrent->peProcess->UniqueProcessId) + gpidLogon = 0; /* Close the current window station */ UserSetProcessWindowStation(NULL); @@ -409,7 +407,7 @@ /* Assign a default window station and desktop to the process */ /* Do not try to open a desktop or window station before winlogon initializes */ - if(ptiCurrent->ppi->hdeskStartup == NULL && LogonProcess != NULL) + if (ptiCurrent->ppi->hdeskStartup == NULL && gpidLogon != 0) { HWINSTA hWinSta = NULL; HDESK hDesk = NULL; @@ -749,17 +747,23 @@ /* Register Object Manager Callbacks */ CalloutData.ProcessCallout = Win32kProcessCallback; CalloutData.ThreadCallout = Win32kThreadCallback; + // CalloutData.GlobalAtomTableCallout = NULL; + // CalloutData.PowerEventCallout = NULL; + // CalloutData.PowerStateCallout = NULL; + // CalloutData.JobCallout = NULL; + CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; + CalloutData.DesktopOpenProcedure = IntDesktopObjectOpen; + CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; + CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; + CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; + CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; + // CalloutData.WindowStationCloseProcedure = NULL; + CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; - CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; - CalloutData.WindowStationOkToCloseProcedure = IntWinstaOkToClose; - CalloutData.DesktopOkToCloseProcedure = IntDesktopOkToClose; - CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; - CalloutData.DesktopCloseProcedure = IntDesktopObjectClose; - CalloutData.DesktopOpenProcedure = IntDesktopObjectOpen; - CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; + // CalloutData.WindowStationOpenProcedure = NULL; /* Register our per-process and per-thread structures. */ - PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); + PsEstablishWin32Callouts(&CalloutData); /* Register service hook callbacks */ #if DBG Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sun Nov 23 16:09:00 2014 @@ -12,8 +12,8 @@ DBG_DEFAULT_CHANNEL(UserMisc); -/* registered Logon process */ -PPROCESSINFO LogonProcess = NULL; +/* Registered logon process ID */ +HANDLE gpidLogon = 0; BOOL FASTCALL co_IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register) @@ -21,38 +21,33 @@ NTSTATUS Status; PEPROCESS Process; - Status = PsLookupProcessByProcessId(ProcessId, - &Process); + Status = PsLookupProcessByProcessId(ProcessId, &Process); if (!NT_SUCCESS(Status)) { EngSetLastError(RtlNtStatusToDosError(Status)); return FALSE; } + ProcessId = Process->UniqueProcessId; + + ObDereferenceObject(Process); + if (Register) { /* Register the logon process */ - if (LogonProcess != NULL) - { - ObDereferenceObject(Process); + if (gpidLogon != 0) return FALSE; - } - - LogonProcess = (PPROCESSINFO)Process->Win32Process; + + gpidLogon = ProcessId; } else { /* Deregister the logon process */ - if (LogonProcess != (PPROCESSINFO)Process->Win32Process) - { - ObDereferenceObject(Process); + if (gpidLogon != ProcessId) return FALSE; - } - - LogonProcess = NULL; - } - - ObDereferenceObject(Process); + + gpidLogon = 0; + } return TRUE; } @@ -451,7 +446,6 @@ STUB RETURN( 0); - case TWOPARAM_ROUTINE_SETCARETPOS: RETURN( (DWORD_PTR)co_IntSetCaretPos((int)Param1, (int)Param2)); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sun Nov 23 16:09:00 2014 @@ -947,7 +947,7 @@ TRACE("About to set process window station with handle (%p)\n", hWindowStation); - if(PsGetCurrentProcessWin32Process() != LogonProcess) + if (gpidLogon != PsGetCurrentProcessId()) { ERR("Unauthorized process attempted to lock the window station!\n"); EngSetLastError(ERROR_ACCESS_DENIED); @@ -992,7 +992,7 @@ TRACE("About to set process window station with handle (%p)\n", hWindowStation); - if(PsGetCurrentProcessWin32Process() != LogonProcess) + if (gpidLogon != PsGetCurrentProcessId()) { ERR("Unauthorized process attempted to unlock the window station!\n"); EngSetLastError(ERROR_ACCESS_DENIED); @@ -1338,12 +1338,12 @@ BOOL APIENTRY NtUserSetLogonNotifyWindow(HWND hWnd) { - if(LogonProcess != PsGetCurrentProcessWin32Process()) + if (gpidLogon != PsGetCurrentProcessId()) { return FALSE; } - if(!IntIsWindow(hWnd)) + if (!IntIsWindow(hWnd)) { return FALSE; } Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] Sun Nov 23 16:09:00 2014 @@ -35,7 +35,7 @@ } WINSTATION_OBJECT, *PWINSTATION_OBJECT; extern WINSTATION_OBJECT *InputWindowStation; -extern PPROCESSINFO LogonProcess; +extern HANDLE gpidLogon; extern HWND hwndSAS; extern UNICODE_STRING gustrWindowStationsDir;

1 0

[hbelusca] 65464: Whitespace fixes.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 15:57:13 2014 New Revision: 65464 URL: http://svn.reactos.org/svn/reactos?rev=65464&view=rev Log: Whitespace fixes. Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sun Nov 23 15:57:13 2014 @@ -277,9 +277,9 @@ /* Note that modified pages should be written here (MiShutdownSystem) */ #ifdef NEWCC - /* Flush all user files before we start shutting down IO */ - /* This is where modified pages are written back by the IO manager */ - CcShutdownSystem(); + /* Flush all user files before we start shutting down IO */ + /* This is where modified pages are written back by the IO manager */ + CcShutdownSystem(); #endif /* In this step, the I/O manager does last-chance shutdown notification */ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=65… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Nov 23 15:57:13 2014 @@ -682,7 +682,8 @@ Status = STATUS_SUCCESS; break; } - case SystemPowerCapabilities: + + case SystemPowerCapabilities: { PSYSTEM_POWER_CAPABILITIES PowerCapabilities = (PSYSTEM_POWER_CAPABILITIES)OutputBuffer; @@ -794,8 +795,8 @@ NTSTATUS NTAPI NtSetSystemPowerState(IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags) + IN SYSTEM_POWER_STATE MinSystemState, + IN ULONG Flags) { KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); POP_POWER_ACTION Action = {0}; @@ -834,7 +835,7 @@ } /* Do it as a kernel-mode caller for consistency with system state */ - return ZwSetSystemPowerState (SystemAction, MinSystemState, Flags); + return ZwSetSystemPowerState(SystemAction, MinSystemState, Flags); } /* Read policy settings (partial shutdown vs. full shutdown) */

1 0

[hbelusca] 65463: [WINSRV]: Pave the way for proper ReactOS shutdown. Part 1/X CORE-8322
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 15:50:49 2014 New Revision: 65463 URL: http://svn.reactos.org/svn/reactos?rev=65463&view=rev Log: [WINSRV]: Pave the way for proper ReactOS shutdown. Part 1/X CORE-8322 Added: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c (with props) trunk/reactos/win32ss/user/winsrv/winsrv.h (with props) Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -16,6 +16,7 @@ consrv/lineinput.c consrv/popup.c consrv/settings.c + consrv/shutdown.c consrv/subsysreg.c consrv/condrv/coninput.c consrv/condrv/conoutput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -11,8 +11,6 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" - -#include <ndk/psfuncs.h> /* This is for COM usage */ #define COBJMACROS Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -9,31 +9,21 @@ #ifndef __CONSRV_H__ #define __CONSRV_H__ +/* Main header */ +#include "../winsrv.h" + /* PSDK/NDK Headers */ -#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <windef.h> -#include <winbase.h> + #include <winnls.h> #include <winreg.h> #include <wincon.h> -#include <winuser.h> + #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/rtlfuncs.h> - -/* Public Win32K Headers */ -#include <ntuser.h> - -/* PSEH for SEH Support */ -#include <pseh/pseh2.h> - -/* CSRSS Header */ -#include <csr/csrsrv.h> /* CONSOLE Headers */ #include <win/conmsg.h> @@ -82,4 +72,11 @@ #include "handle.h" #include "lineinput.h" +/* shutdown.c */ +ULONG +NTAPI +ConsoleClientShutdown(IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase); + #endif /* __CONSRV_H__ */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -548,7 +548,7 @@ LoadedServerDll->DisconnectCallback = ConSrvDisconnect; LoadedServerDll->NewProcessCallback = ConSrvNewProcess; // LoadedServerDll->HardErrorCallback = ConSrvHardError; - LoadedServerDll->ShutdownProcessCallback = NULL; + LoadedServerDll->ShutdownProcessCallback = ConsoleClientShutdown; ConSrvDllInstance = LoadedServerDll->ServerHandle; Added: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c (added) +++ trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/winsrv/consrv/shutdown.c + * PURPOSE: Processes Shutdown + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "consrv.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +// NOTE: See http://blogs.msdn.com/b/ntdebugging/archive/2007/06/09/how-windows-shuts-do… +ULONG +NTAPI +ConsoleClientShutdown(IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase) +{ + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); + + if ( ProcessData->ConsoleHandle != NULL || + ProcessData->HandleTable != NULL ) + { + DPRINT1("ConsoleClientShutdown(0x%p, 0x%x, %s) - Console process [0x%x, 0x%x]\n", + CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", + CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); + + /* We are done with the process itself */ + CsrDereferenceProcess(CsrProcess); + return CsrShutdownCsrProcess; + } + else + { + DPRINT1("ConsoleClientShutdown(0x%p, 0x%x, %s) - Non-console process [0x%x, 0x%x]\n", + CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", + CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); + + /* On first pass, ignore the process since the GUI server should take it... */ + if (FirstPhase) return CsrShutdownNonCsrProcess; + + /* ... otherwise, call the generic handler */ + // FIXME: Should call a generic shutdown handler!! + CsrDereferenceProcess(CsrProcess); + return CsrShutdownCsrProcess; + } + + return CsrShutdownNonCsrProcess; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h (added) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Sun Nov 23 15:50:49 2014 @@ -0,0 +1,42 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/winsrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef __WINSRV_H__ +#define __WINSRV_H__ + +#include <stdarg.h> + +/* PSDK/NDK Headers */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +/* Undocumented user definitions */ +#include <undocuser.h> + +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> + +/* Public Win32K Headers */ +#include <ntuser.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> + +/* CSRSS Header */ +#include <csr/csrsrv.h> + +#endif /* __WINSRV_H__ */ Propchange: trunk/reactos/win32ss/user/winsrv/winsrv.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 65462: [NTFS] - In NtfsQueryDirectory(), don't upcase name in dir search pattern, it can conflict with POSIX names. - In CompareFileName(), handle the fact that for Win32 & DOS we do ...
by pschweitzer＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: pschweitzer Date: Sun Nov 23 15:49:24 2014 New Revision: 65462 URL: http://svn.reactos.org/svn/reactos?rev=65462&view=rev Log: [NTFS] - In NtfsQueryDirectory(), don't upcase name in dir search pattern, it can conflict with POSIX names. - In CompareFileName(), handle the fact that for Win32 & DOS we do case insensitive comparisons by upcasing name before match. Don't do it for POSIX names! This fixes name completion in cmd for POSIX. And doesn't break it for Win32 :-). Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 23 15:49:24 2014 @@ -348,14 +348,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - Status = RtlUpcaseUnicodeString(&Pattern, SearchPattern, FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlUpcaseUnicodeString('%wZ') failed with status 0x%08lx\n", &Pattern, Status); - ExFreePoolWithTag(Ccb->DirectorySearchPattern, TAG_NTFS); - Ccb->DirectorySearchPattern = NULL; - return Status; - } + memcpy(Ccb->DirectorySearchPattern, SearchPattern->Buffer, SearchPattern->Length); Ccb->DirectorySearchPattern[SearchPattern->Length / sizeof(WCHAR)] = 0; } } Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Nov 23 15:49:24 2014 @@ -466,6 +466,7 @@ PINDEX_ENTRY_ATTRIBUTE IndexEntry, BOOLEAN DirSearch) { + BOOLEAN Ret, Alloc = FALSE; UNICODE_STRING EntryName; EntryName.Buffer = IndexEntry->FileName.Name; @@ -474,7 +475,25 @@ if (DirSearch) { - return FsRtlIsNameInExpression(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL); + UNICODE_STRING IntFileName; + if (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX) + { + ASSERT(NT_SUCCESS(RtlUpcaseUnicodeString(&IntFileName, FileName, TRUE))); + Alloc = TRUE; + } + else + { + IntFileName = *FileName; + } + + Ret = FsRtlIsNameInExpression(&IntFileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL); + + if (Alloc) + { + RtlFreeUnicodeString(&IntFileName); + } + + return Ret; } else {

1 0

[hbelusca] 65461: Resuscitate VMS subsystem (yeah, you've correctly read: VMS!!) from revision 24496.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 15:24:49 2014 New Revision: 65461 URL: http://svn.reactos.org/svn/reactos?rev=65461&view=rev Log: Resuscitate VMS subsystem (yeah, you've correctly read: VMS!!) from revision 24496. Added: trunk/rossubsys/vms/ - copied from r24496, trunk/vms/

1 0

[hbelusca] 65460: Resuscitate POSIX subsystem from revision 21378.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 15:23:36 2014 New Revision: 65460 URL: http://svn.reactos.org/svn/reactos?rev=65460&view=rev Log: Resuscitate POSIX subsystem from revision 21378. Added: trunk/rossubsys/posix/ - copied from r21378, trunk/posix/

1 0

[hbelusca] 65459: Resuscitate OS/2 subsystem from revision 24496.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 15:22:07 2014 New Revision: 65459 URL: http://svn.reactos.org/svn/reactos?rev=65459&view=rev Log: Resuscitate OS/2 subsystem from revision 24496. Added: trunk/rossubsys/os2/ - copied from r24496, trunk/os2/

1 0

[hbelusca] 65458: Create a repository to ressuscitate our verrrrry old subsystems.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 14:50:34 2014 New Revision: 65458 URL: http://svn.reactos.org/svn/reactos?rev=65458&view=rev Log: Create a repository to ressuscitate our verrrrry old subsystems. Added: trunk/rossubsys/

1 0

[hbelusca] 65457: [CONSRV]: Reduce code duplication and remove unused InputWaitHandle member.
by hbelusca＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: hbelusca Date: Sun Nov 23 14:26:37 2014 New Revision: 65457 URL: http://svn.reactos.org/svn/reactos?rev=65457&view=rev Log: [CONSRV]: Reduce code duplication and remove unused InputWaitHandle member. Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/procinit.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Nov 23 14:26:37 2014 @@ -283,8 +283,6 @@ ASSERT(Console); *Console = NULL; - // RtlEnterCriticalSection(&ProcessData->HandleTableLock); - if (ConSrvValidateConsole(&GrabConsole, ProcessData->ConsoleHandle, CONSOLE_RUNNING, @@ -295,7 +293,6 @@ Status = STATUS_SUCCESS; } - // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } @@ -948,14 +945,6 @@ return Status; } - /* Mark the process as having a console */ - ProcessData->ConsoleApp = TRUE; - CsrProcess->Flags |= CsrProcessIsConsoleApp; - - /* Return the console handle and the input wait handle to the caller */ - AllocConsoleRequest->ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; - AllocConsoleRequest->ConsoleStartInfo->InputWaitHandle = ProcessData->InputWaitHandle; - /* Set the Property-Dialog and Control-Dispatcher handlers */ ProcessData->PropRoutine = AllocConsoleRequest->PropRoutine; ProcessData->CtrlRoutine = AllocConsoleRequest->CtrlRoutine; @@ -1038,14 +1027,6 @@ goto Quit; } - /* Mark the process as having a console */ - TargetProcessData->ConsoleApp = TRUE; - TargetProcess->Flags |= CsrProcessIsConsoleApp; - - /* Return the console handle and the input wait handle to the caller */ - AttachConsoleRequest->ConsoleStartInfo->ConsoleHandle = TargetProcessData->ConsoleHandle; - AttachConsoleRequest->ConsoleStartInfo->InputWaitHandle = TargetProcessData->InputWaitHandle; - /* Set the Property-Dialog and Control-Dispatcher handlers */ TargetProcessData->PropRoutine = AttachConsoleRequest->PropRoutine; TargetProcessData->CtrlRoutine = AttachConsoleRequest->CtrlRoutine; @@ -1060,16 +1041,7 @@ CSR_API(SrvFreeConsole) { - PCSR_PROCESS CsrProcess = CsrGetClientThread()->Process; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - - ConSrvRemoveConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process)); - - /* Mark the process as not having a console anymore */ - ProcessData->ConsoleApp = FALSE; - CsrProcess->Flags &= ~CsrProcessIsConsoleApp; - - return STATUS_SUCCESS; + return ConSrvRemoveConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process)); } NTSTATUS NTAPI Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Sun Nov 23 14:26:37 2014 @@ -53,9 +53,7 @@ PCSR_PROCESS Process; // Process owning this structure. HANDLE ConsoleHandle; - HANDLE InputWaitHandle; - - BOOLEAN ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. + BOOLEAN ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sun Nov 23 14:26:37 2014 @@ -555,7 +555,7 @@ Status = NtDuplicateObject(NtCurrentProcess(), Console->InputBuffer.ActiveEvent, ProcessData->Process->ProcessHandle, - &ProcessData->InputWaitHandle, + &ConsoleInitInfo->ConsoleStartInfo->InputWaitHandle, EVENT_ALL_ACCESS, 0, 0); if (!NT_SUCCESS(Status)) { @@ -567,6 +567,13 @@ ProcessData->ConsoleHandle = NULL; return Status; } + + /* Mark the process as having a console */ + ProcessData->ConsoleApp = TRUE; + ProcessData->Process->Flags |= CsrProcessIsConsoleApp; + + /* Return the console handle to the caller */ + ConsoleInitInfo->ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; /* Insert the process into the processes list of the console */ InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); @@ -664,7 +671,7 @@ Status = NtDuplicateObject(NtCurrentProcess(), Console->InputBuffer.ActiveEvent, ProcessData->Process->ProcessHandle, - &ProcessData->InputWaitHandle, + &ConsoleStartInfo->InputWaitHandle, EVENT_ALL_ACCESS, 0, 0); if (!NT_SUCCESS(Status)) { @@ -676,6 +683,13 @@ goto Quit; } + /* Mark the process as having a console */ + ProcessData->ConsoleApp = TRUE; + ProcessData->Process->Flags |= CsrProcessIsConsoleApp; + + /* Return the console handle to the caller */ + ConsoleStartInfo->ConsoleHandle = ProcessData->ConsoleHandle; + /* Insert the process into the processes list of the console */ InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); @@ -693,74 +707,78 @@ return Status; } -VOID +NTSTATUS ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData) { PCONSOLE Console; + PCONSOLE_PROCESS_DATA ConsoleLeaderProcess; DPRINT("ConSrvRemoveConsole\n"); - // RtlEnterCriticalSection(&ProcessData->HandleTableLock); + /* Mark the process as not having a console anymore */ + ProcessData->ConsoleApp = FALSE; + ProcessData->Process->Flags &= ~CsrProcessIsConsoleApp; /* Validate and lock the console */ - if (ConSrvValidateConsole(&Console, - ProcessData->ConsoleHandle, - CONSOLE_RUNNING, TRUE)) - { - /* Retrieve the console leader process */ - PCONSOLE_PROCESS_DATA ConsoleLeaderProcess = ConSrvGetConsoleLeaderProcess(Console); - - DPRINT("ConSrvRemoveConsole - Locking OK\n"); - - /* Close all console handles and free the handles table */ - ConSrvFreeHandlesTable(ProcessData); - - /* Detach the process from the console */ - ProcessData->ConsoleHandle = NULL; - - /* Remove the process from the console's list of processes */ - RemoveEntryList(&ProcessData->ConsoleLink); - - /* Check whether the console should send a last close notification */ - if (Console->NotifyLastClose) + if (!ConSrvValidateConsole(&Console, + ProcessData->ConsoleHandle, + CONSOLE_RUNNING, TRUE)) + { + // FIXME: Find another status code + return STATUS_UNSUCCESSFUL; + } + + DPRINT("ConSrvRemoveConsole - Locking OK\n"); + + /* Retrieve the console leader process */ + ConsoleLeaderProcess = ConSrvGetConsoleLeaderProcess(Console); + + /* Close all console handles and free the handles table */ + ConSrvFreeHandlesTable(ProcessData); + + /* Detach the process from the console */ + ProcessData->ConsoleHandle = NULL; + + /* Remove the process from the console's list of processes */ + RemoveEntryList(&ProcessData->ConsoleLink); + + /* Check whether the console should send a last close notification */ + if (Console->NotifyLastClose) + { + /* If we are removing the process which wants the last close notification... */ + if (ProcessData == Console->NotifiedLastCloseProcess) { - /* If we are removing the process which wants the last close notification... */ - if (ProcessData == Console->NotifiedLastCloseProcess) - { - /* ... just reset the flag and the pointer... */ - Console->NotifyLastClose = FALSE; - Console->NotifiedLastCloseProcess = NULL; - } + /* ... just reset the flag and the pointer... */ + Console->NotifyLastClose = FALSE; + Console->NotifiedLastCloseProcess = NULL; + } + /* + * ... otherwise, if we are removing the console leader process + * (that cannot be the process wanting the notification, because + * the previous case already dealt with it)... + */ + else if (ProcessData == ConsoleLeaderProcess) + { /* - * ... otherwise, if we are removing the console leader process - * (that cannot be the process wanting the notification, because - * the previous case already dealt with it)... + * ... reset the flag first (so that we avoid multiple notifications) + * and then send the last close notification. */ - else if (ProcessData == ConsoleLeaderProcess) - { - /* - * ... reset the flag first (so that we avoid multiple notifications) - * and then send the last close notification. - */ - Console->NotifyLastClose = FALSE; - ConSrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, Console->NotifiedLastCloseProcess); - - /* Only now, reset the pointer */ - Console->NotifiedLastCloseProcess = NULL; - } + Console->NotifyLastClose = FALSE; + ConSrvConsoleCtrlEvent(CTRL_LAST_CLOSE_EVENT, Console->NotifiedLastCloseProcess); + + /* Only now, reset the pointer */ + Console->NotifiedLastCloseProcess = NULL; } - - /* Update the internal info of the terminal */ - TermRefreshInternalInfo(Console); - - /* Release the console */ - DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); - ConSrvReleaseConsole(Console, TRUE); - //CloseHandle(ProcessData->InputWaitHandle); - //ProcessData->InputWaitHandle = NULL; - } - - // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + } + + /* Update the internal info of the terminal */ + TermRefreshInternalInfo(Console); + + /* Release the console */ + DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); + ConSrvReleaseConsole(Console, TRUE); + + return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Sun Nov 23 14:26:37 2014 @@ -353,7 +353,6 @@ /* Initialize the new (target) process */ RtlZeroMemory(TargetProcessData, sizeof(*TargetProcessData)); TargetProcessData->Process = TargetProcess; - TargetProcessData->InputWaitHandle = NULL; TargetProcessData->ConsoleHandle = NULL; TargetProcessData->ConsoleApp = FALSE; @@ -491,14 +490,6 @@ } } - /* Mark the process as having a console */ - ProcessData->ConsoleApp = TRUE; - // ProcessData->Flags |= CsrProcessIsConsoleApp; - - /* Return the console handle and the input wait handle to the caller */ - ConnectInfo->ConsoleStartInfo.ConsoleHandle = ProcessData->ConsoleHandle; - ConnectInfo->ConsoleStartInfo.InputWaitHandle = ProcessData->InputWaitHandle; - /* Set the Property-Dialog and Control-Dispatcher handlers */ ProcessData->PropRoutine = ConnectInfo->PropRoutine; ProcessData->CtrlRoutine = ConnectInfo->CtrlRoutine; @@ -521,10 +512,6 @@ { DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); ConSrvRemoveConsole(ProcessData); - - /* Mark the process as not having a console anymore */ - ProcessData->ConsoleApp = FALSE; - Process->Flags &= ~CsrProcessIsConsoleApp; } RtlDeleteCriticalSection(&ProcessData->HandleTableLock); Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] Sun Nov 23 14:26:37 2014 @@ -20,4 +20,4 @@ PHANDLE pOutputHandle, PHANDLE pErrorHandle, PCONSOLE_START_INFO ConsoleStartInfo); -VOID ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData); +NTSTATUS ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);

1 0

[pschweitzer] 65456: [NTFS] - Implement GetBestFileNameFromRecord() which will select the higher subsystem name available (POSIX -> Win32 -> DOS) and return it - Replace the hand-made implementatio...
by pschweitzer＠svn.reactos.org 23 Nov '14

23 Nov '14

Author: pschweitzer Date: Sun Nov 23 14:07:08 2014 New Revision: 65456 URL: http://svn.reactos.org/svn/reactos?rev=65456&view=rev Log: [NTFS] - Implement GetBestFileNameFromRecord() which will select the higher subsystem name available (POSIX -> Win32 -> DOS) and return it - Replace the hand-made implementation of it in dirctl functions relying on it (NtfsGetDirectoryInformation(), NtfsGetFullDirectoryInformation(), NtfsGetBothDirectoryInformation()) - Use it in NtfsMakeFCBFromDirEntry() This fixes browsing POSIX volume (and opening file) in cmd. Even though, explorer doesn't seem to be happy with such change... This doesn't fix yet the autocompletion in cmd either. Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Nov 23 14:07:08 2014 @@ -314,4 +314,22 @@ return NULL; } +PFILENAME_ATTRIBUTE +GetBestFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +{ + PFILENAME_ATTRIBUTE FileName; + + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); + if (FileName == NULL) + { + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); + if (FileName == NULL) + { + FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); + } + } + + return FileName; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 23 14:07:08 2014 @@ -137,15 +137,7 @@ DPRINT("NtfsGetNameInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); - } - } + FileName = GetBestFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -173,15 +165,7 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); - } - } + FileName = GetBestFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -222,15 +206,7 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); - } - } + FileName = GetBestFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -272,15 +248,7 @@ DPRINT("NtfsGetBothDirectoryInformation() called\n"); - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); - if (FileName == NULL) - { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); - } - } + FileName = GetBestFileNameFromRecord(FileRecord); ASSERT(FileName != NULL); ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Nov 23 14:07:08 2014 @@ -396,7 +396,7 @@ DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); - FileName = GetFileNameFromRecord(Record, NTFS_FILE_NAME_WIN32); + FileName = GetBestFileNameFromRecord(Record); if (!FileName) { return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Nov 23 14:07:08 2014 @@ -452,6 +452,9 @@ PFILENAME_ATTRIBUTE GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType); +PFILENAME_ATTRIBUTE +GetBestFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); + /* blockdev.c */ NTSTATUS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs