Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[hbelusca] 57560: This was not the good thing to copy.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 13:02:55 2012 New Revision: 57560 URL: http://svn.reactos.org/svn/reactos?rev=57560&view=rev Log: This was not the good thing to copy. Removed: branches/ros-csrss/

12 years, 2 months

[hbelusca] 57559: Create a branch for working on csrss and Co.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 12:46:30 2012 New Revision: 57559 URL: http://svn.reactos.org/svn/reactos?rev=57559&view=rev Log: Create a branch for working on csrss and Co. Added: branches/ros-csrss/ - copied from r57558, trunk/

12 years, 2 months

[hbelusca] 57558: [CSRSS] Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 14 11:46:22 2012 New Revision: 57558 URL: http://svn.reactos.org/svn/reactos?rev=57558&view=rev Log: [CSRSS] Code formatting only. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/csrplugin.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -92,35 +92,35 @@ typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - ULONG NrCharactersToWrite; - ULONG NrCharactersWritten; - HANDLE UnpauseEvent; - BYTE Buffer[0]; + HANDLE ConsoleHandle; + BOOL Unicode; + ULONG NrCharactersToWrite; + ULONG NrCharactersWritten; + HANDLE UnpauseEvent; + BYTE Buffer[0]; } CSRSS_WRITE_CONSOLE, *PCSRSS_WRITE_CONSOLE; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - WORD NrCharactersToRead; - WORD NrCharactersRead; - HANDLE EventHandle; - PVOID Buffer; - UNICODE_STRING ExeName; - DWORD CtrlWakeupMask; - DWORD ControlKeyState; + HANDLE ConsoleHandle; + BOOL Unicode; + WORD NrCharactersToRead; + WORD NrCharactersRead; + HANDLE EventHandle; + PVOID Buffer; + UNICODE_STRING ExeName; + DWORD CtrlWakeupMask; + DWORD ControlKeyState; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct { - PCONTROLDISPATCHER CtrlDispatcher; - BOOLEAN ConsoleNeeded; - INT ShowCmd; - HANDLE Console; - HANDLE InputHandle; - HANDLE OutputHandle; + PCONTROLDISPATCHER CtrlDispatcher; + BOOLEAN ConsoleNeeded; + INT ShowCmd; + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; } CSRSS_ALLOC_CONSOLE, *PCSRSS_ALLOC_CONSOLE; typedef struct @@ -130,254 +130,254 @@ typedef struct { - HANDLE ConsoleHandle; - CONSOLE_SCREEN_BUFFER_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_SCREEN_BUFFER_INFO Info; } CSRSS_SCREEN_BUFFER_INFO, *PCSRSS_SCREEN_BUFFER_INFO; typedef struct { - HANDLE ConsoleHandle; - COORD Position; + HANDLE ConsoleHandle; + COORD Position; } CSRSS_SET_CURSOR, *PCSRSS_SET_CURSOR; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - union - { - CHAR AsciiChar; - WCHAR UnicodeChar; - } Char; - COORD Position; - WORD Length; - ULONG NrCharactersWritten; + HANDLE ConsoleHandle; + BOOL Unicode; + union + { + CHAR AsciiChar; + WCHAR UnicodeChar; + } Char; + COORD Position; + WORD Length; + ULONG NrCharactersWritten; } CSRSS_FILL_OUTPUT, *PCSRSS_FILL_OUTPUT; typedef struct { - HANDLE ConsoleHandle; - CHAR Attribute; - COORD Coord; - WORD Length; + HANDLE ConsoleHandle; + CHAR Attribute; + COORD Coord; + WORD Length; } CSRSS_FILL_OUTPUT_ATTRIB, *PCSRSS_FILL_OUTPUT_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - INPUT_RECORD Input; - BOOL MoreEvents; - HANDLE Event; + HANDLE ConsoleHandle; + BOOL Unicode; + INPUT_RECORD Input; + BOOL MoreEvents; + HANDLE Event; } CSRSS_READ_INPUT, *PCSRSS_READ_INPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - WORD Length; - COORD Coord; - COORD EndCoord; - ULONG NrCharactersWritten; - CHAR String[0]; + HANDLE ConsoleHandle; + BOOL Unicode; + WORD Length; + COORD Coord; + COORD EndCoord; + ULONG NrCharactersWritten; + CHAR String[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_CHAR, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR; typedef struct { - HANDLE ConsoleHandle; - WORD Length; - COORD Coord; - COORD EndCoord; - WORD Attribute[0]; + HANDLE ConsoleHandle; + WORD Length; + COORD Coord; + COORD EndCoord; + WORD Attribute[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - CONSOLE_CURSOR_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; } CSRSS_GET_CURSOR_INFO, *PCSRSS_GET_CURSOR_INFO; typedef struct { - HANDLE ConsoleHandle; - CONSOLE_CURSOR_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; } CSRSS_SET_CURSOR_INFO, *PCSRSS_SET_CURSOR_INFO; typedef struct { - HANDLE ConsoleHandle; - WORD Attrib; + HANDLE ConsoleHandle; + WORD Attrib; } CSRSS_SET_ATTRIB, *PCSRSS_SET_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - DWORD Mode; + HANDLE ConsoleHandle; + DWORD Mode; } CSRSS_SET_CONSOLE_MODE, *PCSRSS_SET_CONSOLE_MODE; typedef struct { - HANDLE ConsoleHandle; - DWORD ConsoleMode; + HANDLE ConsoleHandle; + DWORD ConsoleMode; } CSRSS_GET_CONSOLE_MODE, *PCSRSS_GET_CONSOLE_MODE; typedef struct { - DWORD Access; - DWORD ShareMode; - BOOL Inheritable; - HANDLE OutputHandle; /* handle to newly created screen buffer */ + DWORD Access; + DWORD ShareMode; + BOOL Inheritable; + HANDLE OutputHandle; /* handle to newly created screen buffer */ } CSRSS_CREATE_SCREEN_BUFFER, *PCSRSS_CREATE_SCREEN_BUFFER; typedef struct { - HANDLE OutputHandle; /* handle to screen buffer to switch to */ + HANDLE OutputHandle; /* handle to screen buffer to switch to */ } CSRSS_SET_SCREEN_BUFFER, *PCSRSS_SET_SCREEN_BUFFER; typedef struct { - HANDLE UniqueThread; - CLIENT_ID Cid; + HANDLE UniqueThread; + CLIENT_ID Cid; } CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; typedef struct { - DWORD Length; - PWCHAR Title; + DWORD Length; + PWCHAR Title; } CSRSS_SET_TITLE, *PCSRSS_SET_TITLE; typedef struct { - DWORD Length; - PWCHAR Title; + DWORD Length; + PWCHAR Title; } CSRSS_GET_TITLE, *PCSRSS_GET_TITLE; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - COORD BufferSize; - COORD BufferCoord; - SMALL_RECT WriteRegion; - CHAR_INFO* CharInfo; + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT WriteRegion; + CHAR_INFO* CharInfo; } CSRSS_WRITE_CONSOLE_OUTPUT, *PCSRSS_WRITE_CONSOLE_OUTPUT; typedef struct { - HANDLE ConsoleInput; + HANDLE ConsoleInput; } CSRSS_FLUSH_INPUT_BUFFER, *PCSRSS_FLUSH_INPUT_BUFFER; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - SMALL_RECT ScrollRectangle; - BOOLEAN UseClipRectangle; - SMALL_RECT ClipRectangle; - COORD DestinationOrigin; - CHAR_INFO Fill; + HANDLE ConsoleHandle; + BOOL Unicode; + SMALL_RECT ScrollRectangle; + BOOLEAN UseClipRectangle; + SMALL_RECT ClipRectangle; + COORD DestinationOrigin; + CHAR_INFO Fill; } CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD NumCharsToRead; - COORD ReadCoord; - COORD EndCoord; - DWORD CharsRead; - CHAR String[0]; -}CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; - -typedef struct -{ - HANDLE ConsoleHandle; - DWORD NumAttrsToRead; - COORD ReadCoord; - COORD EndCoord; - WORD Attribute[0]; -}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; - -typedef struct -{ - HANDLE ConsoleHandle; - DWORD NumInputEvents; -}CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; - -typedef struct -{ - HANDLE ProcessId; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD NumCharsToRead; + COORD ReadCoord; + COORD EndCoord; + DWORD CharsRead; + CHAR String[0]; +} CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumAttrsToRead; + COORD ReadCoord; + COORD EndCoord; + WORD Attribute[0]; +} CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumInputEvents; +} CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; + +typedef struct +{ + HANDLE ProcessId; } CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; typedef struct { - UINT Flags; - DWORD Reserved; + UINT Flags; + DWORD Reserved; } CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; typedef struct { - DWORD Level; - DWORD Flags; + DWORD Level; + DWORD Flags; } CSRSS_SET_SHUTDOWN_PARAMETERS, *PCSRSS_SET_SHUTDOWN_PARAMETERS; typedef struct { - DWORD Level; - DWORD Flags; + DWORD Level; + DWORD Flags; } CSRSS_GET_SHUTDOWN_PARAMETERS, *PCSRSS_GET_SHUTDOWN_PARAMETERS; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD Length; - INPUT_RECORD* InputRecord; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; } CSRSS_PEEK_CONSOLE_INPUT, *PCSRSS_PEEK_CONSOLE_INPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - COORD BufferSize; - COORD BufferCoord; - SMALL_RECT ReadRegion; - CHAR_INFO* CharInfo; + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT ReadRegion; + CHAR_INFO* CharInfo; } CSRSS_READ_CONSOLE_OUTPUT, *PCSRSS_READ_CONSOLE_OUTPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD Length; - INPUT_RECORD* InputRecord; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; } CSRSS_WRITE_CONSOLE_INPUT, *PCSRSS_WRITE_CONSOLE_INPUT; typedef struct { - DWORD Access; - BOOL Inheritable; - HANDLE Handle; - DWORD ShareMode; + DWORD Access; + BOOL Inheritable; + HANDLE Handle; + DWORD ShareMode; } CSRSS_GET_INPUT_HANDLE, *PCSRSS_GET_INPUT_HANDLE, CSRSS_GET_OUTPUT_HANDLE, *PCSRSS_GET_OUTPUT_HANDLE; typedef struct { - HANDLE Handle; + HANDLE Handle; } CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE; typedef struct { - HANDLE Handle; + HANDLE Handle; } CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE; typedef struct { - HANDLE Handle; - DWORD Access; - BOOL Inheritable; - DWORD Options; + HANDLE Handle; + DWORD Access; + BOOL Inheritable; + DWORD Options; } CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE; #define CONSOLE_HARDWARE_STATE_GET 0 @@ -388,72 +388,72 @@ typedef struct { - HANDLE ConsoleHandle; - DWORD SetGet; /* 0=get; 1=set */ - DWORD State; + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; } CSRSS_SETGET_CONSOLE_HW_STATE, *PCSRSS_SETGET_CONSOLE_HW_STATE; typedef struct { - HWND WindowHandle; + HWND WindowHandle; } CSRSS_GET_CONSOLE_WINDOW, *PCSRSS_GET_CONSOLE_WINDOW; typedef struct { - HICON WindowIcon; + HICON WindowIcon; } CSRSS_SET_CONSOLE_ICON, *PCSRSS_SET_CONSOLE_ICON; typedef struct { - HDESK DesktopHandle; + HDESK DesktopHandle; } CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP; typedef struct { - HWND DesktopWindow; - ULONG Width; - ULONG Height; + HWND DesktopWindow; + ULONG Width; + ULONG Height; } CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP; typedef struct { - HWND DesktopWindow; + HWND DesktopWindow; } CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP; typedef struct { - HWND LogonNotifyWindow; + HWND LogonNotifyWindow; } CSRSS_SET_LOGON_NOTIFY_WINDOW, *PCSRSS_SET_LOGON_NOTIFY_WINDOW; typedef struct { - HANDLE ProcessId; - BOOL Register; + HANDLE ProcessId; + BOOL Register; } CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_GET_CONSOLE_CP, *PCSRSS_GET_CONSOLE_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_SET_CONSOLE_CP, *PCSRSS_SET_CONSOLE_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_GET_CONSOLE_OUTPUT_CP, *PCSRSS_GET_CONSOLE_OUTPUT_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_SET_CONSOLE_OUTPUT_CP, *PCSRSS_SET_CONSOLE_OUTPUT_CP; typedef struct { - HANDLE InputWaitHandle; + HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; typedef struct @@ -474,58 +474,58 @@ typedef struct { - LPWSTR lpExeName; - DWORD BytesWritten; - DWORD AliasBufferLength; - LPWSTR AliasBuffer; + LPWSTR lpExeName; + DWORD BytesWritten; + DWORD AliasBufferLength; + LPWSTR AliasBuffer; } CSRSS_GET_ALL_CONSOLE_ALIASES, *PCSRSS_GET_ALL_CONSOLE_ALIAS; typedef struct { - LPWSTR lpExeName; - DWORD Length; + LPWSTR lpExeName; + DWORD Length; } CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH, *PCSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH; typedef struct { - DWORD BytesWritten; - DWORD Length; - LPWSTR ExeNames; -} CSRSS_GET_CONSOLE_ALIASES_EXES, *PCSRSS_GET_CONSOLE_ALIASES_EXES; - -typedef struct -{ - DWORD Length; + DWORD BytesWritten; + DWORD Length; + LPWSTR ExeNames; +} CSRSS_GET_CONSOLE_ALIASES_EXES, *PCSRSS_GET_CONSOLE_ALIASES_EXES; + +typedef struct +{ + DWORD Length; } CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH; typedef struct { - DWORD Event; - DWORD ProcessGroup; + DWORD Event; + DWORD ProcessGroup; } CSRSS_GENERATE_CTRL_EVENT, *PCSRSS_GENERATE_CTRL_EVENT; typedef struct { - HANDLE OutputHandle; - COORD Size; + HANDLE OutputHandle; + COORD Size; } CSRSS_SET_SCREEN_BUFFER_SIZE, *PCSRSS_SET_SCREEN_BUFFER_SIZE; typedef struct { - CONSOLE_SELECTION_INFO Info; + CONSOLE_SELECTION_INFO Info; } CSRSS_GET_CONSOLE_SELECTION_INFO, *PCSRSS_GET_CONSOLE_SELECTION_INFO; typedef struct { - UNICODE_STRING ExeName; - DWORD Length; + UNICODE_STRING ExeName; + DWORD Length; } CSRSS_GET_COMMAND_HISTORY_LENGTH, *PCSRSS_GET_COMMAND_HISTORY_LENGTH; typedef struct { - UNICODE_STRING ExeName; - PWCHAR History; - DWORD Length; + UNICODE_STRING ExeName; + PWCHAR History; + DWORD Length; } CSRSS_GET_COMMAND_HISTORY, *PCSRSS_GET_COMMAND_HISTORY; typedef struct @@ -535,21 +535,21 @@ typedef struct { - UNICODE_STRING ExeName; - DWORD NumCommands; + UNICODE_STRING ExeName; + DWORD NumCommands; } CSRSS_SET_HISTORY_NUMBER_COMMANDS, *PCSRSS_SET_HISTORY_NUMBER_COMMANDS; typedef struct { - DWORD HistoryBufferSize; - DWORD NumberOfHistoryBuffers; - DWORD dwFlags; + DWORD HistoryBufferSize; + DWORD NumberOfHistoryBuffers; + DWORD dwFlags; } CSRSS_GET_HISTORY_INFO, *PCSRSS_GET_HISTORY_INFO, CSRSS_SET_HISTORY_INFO, *PCSRSS_SET_HISTORY_INFO;; typedef struct { - UINT UniqueID; + UINT UniqueID; } CSRSS_GET_TEMP_FILE, *PCSRSS_GET_TEMP_FILE; typedef struct Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -36,9 +36,9 @@ typedef enum _CSR_THREAD_FLAGS { - CsrThreadAltertable = 0x1, - CsrThreadInTermination = 0x2, - CsrThreadTerminated = 0x4, + CsrThreadAltertable = 0x1, + CsrThreadInTermination = 0x2, + CsrThreadTerminated = 0x4, CsrThreadIsServerThread = 0x10 } CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; @@ -52,7 +52,7 @@ typedef enum _CSR_SHUTDOWN_FLAGS { CsrShutdownSystem = 4, - CsrShutdownOther = 8 + CsrShutdownOther = 8 } CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; typedef enum _CSR_DEBUG_FLAGS @@ -63,21 +63,21 @@ typedef enum _CSR_PROCESS_FLAGS { - CsrProcessTerminating = 0x1, - CsrProcessSkipShutdown = 0x2, - CsrProcessNormalPriority = 0x10, - CsrProcessIdlePriority = 0x20, - CsrProcessHighPriority = 0x40, - CsrProcessRealtimePriority = 0x80, - CsrProcessCreateNewGroup = 0x100, - CsrProcessTerminated = 0x200, + CsrProcessTerminating = 0x1, + CsrProcessSkipShutdown = 0x2, + CsrProcessNormalPriority = 0x10, + CsrProcessIdlePriority = 0x20, + CsrProcessHighPriority = 0x40, + CsrProcessRealtimePriority = 0x80, + CsrProcessCreateNewGroup = 0x100, + CsrProcessTerminated = 0x200, CsrProcessLastThreadTerminated = 0x400, - CsrProcessIsConsoleApp = 0x800 + CsrProcessIsConsoleApp = 0x800 } CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; #define CsrProcessPriorityFlags (CsrProcessNormalPriority | \ - CsrProcessIdlePriority | \ - CsrProcessHighPriority | \ + CsrProcessIdlePriority | \ + CsrProcessHighPriority | \ CsrProcessRealtimePriority) typedef struct _CSRSS_CON_PROCESS_DATA @@ -240,9 +240,9 @@ typedef struct _CSRSS_API_DEFINITION { - ULONG Type; - ULONG MinRequestSize; - CSRSS_API_PROC Handler; + ULONG Type; + ULONG MinRequestSize; + CSRSS_API_PROC Handler; } CSRSS_API_DEFINITION, *PCSRSS_API_DEFINITION; #define CSRSS_DEFINE_API(Func, Handler) \ @@ -255,9 +255,9 @@ PCSRSS_API_DEFINITION *ApiDefinitions; } CSRSS_LISTEN_DATA, *PCSRSS_LISTEN_DATA; -#define CSR_API(n) NTSTATUS WINAPI n (\ -PCSR_PROCESS ProcessData,\ -PCSR_API_MESSAGE Request) +#define CSR_API(n) NTSTATUS WINAPI n ( \ + PCSR_PROCESS ProcessData, \ + PCSR_API_MESSAGE Request) /* init.c */ extern HANDLE hBootstrapOk; Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -21,17 +21,17 @@ #include "api.h" typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context); + PVOID Context); typedef struct tagCSRSS_EXPORTED_FUNCS { - CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; + CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS; typedef BOOL (WINAPI *CSRPLUGIN_INIT_COMPLETE_PROC)(void); typedef VOID (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG HardErrorMessage); + IN PHARDERROR_MSG HardErrorMessage); typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_INHERIT_PROC)(IN PCSR_PROCESS SourceProcessData, IN PCSR_PROCESS TargetProcessData); @@ -40,13 +40,13 @@ typedef struct tagCSRSS_SERVER_PROCS { - CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; - CSRPLUGIN_HARDERROR_PROC HardErrorProc; - CSRPLUGIN_PROCESS_INHERIT_PROC ProcessInheritProc; - CSRPLUGIN_PROCESS_DELETED_PROC ProcessDeletedProc; + CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; + CSRPLUGIN_HARDERROR_PROC HardErrorProc; + CSRPLUGIN_PROCESS_INHERIT_PROC ProcessInheritProc; + CSRPLUGIN_PROCESS_DELETED_PROC ProcessDeletedProc; } CSRPLUGIN_SERVER_PROCS, *PCSRPLUGIN_SERVER_PROCS; typedef BOOL (WINAPI *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions, - PCSRPLUGIN_SERVER_PROCS ServerProcs); + PCSRPLUGIN_SERVER_PROCS ServerProcs); /* EOF */

12 years, 2 months

[ekohl] 57557: [LSASRV] LsapLookupIsolatedNames: Add a domain entry to the referenced domain list for an unknown/unidentified domain. Its SID is the SID of the account minus the last sub-authority ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 14 10:20:59 2012 New Revision: 57557 URL: http://svn.reactos.org/svn/reactos?rev=57557&view=rev Log: [LSASRV] LsapLookupIsolatedNames: Add a domain entry to the referenced domain list for an unknown/unidentified domain. Its SID is the SID of the account minus the last sub-authority and its name is an empty string. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sun Oct 14 10:20:59 2012 @@ -921,7 +921,7 @@ DstSid = MIDL_user_allocate(DstSidSize); if (DstSid == NULL) - return FALSE; + return NULL; RtlInitializeSid(DstSid, RtlIdentifierAuthoritySid(SrcSid), @@ -938,6 +938,40 @@ *q = RelativeId; return DstSid; +} + + +static PSID +CreateDomainSidFromAccountSid(PSID AccountSid) +{ + UCHAR RidCount; + PSID DomainSid; + ULONG i; + ULONG DstSidSize; + PULONG p, q; + + RidCount = *RtlSubAuthorityCountSid(AccountSid); + if (RidCount > 0) + RidCount--; + + DstSidSize = RtlLengthRequiredSid(RidCount); + + DomainSid = MIDL_user_allocate(DstSidSize); + if (DomainSid == NULL) + return NULL; + + RtlInitializeSid(DomainSid, + RtlIdentifierAuthoritySid(AccountSid), + RidCount); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(AccountSid, i); + q = RtlSubAuthoritySid(DomainSid, i); + *q = *p; + } + + return DomainSid; } @@ -950,7 +984,9 @@ PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, PULONG Mapped) { + UNICODE_STRING EmptyDomainName = RTL_CONSTANT_STRING(L""); PWELL_KNOWN_SID ptr, ptr2; + PSID DomainSid; ULONG DomainIndex; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -964,6 +1000,8 @@ /* Ignore fully qualified account names */ if (DomainNames[i].Length != 0) continue; + + TRACE("Mapping name: %wZ\n", &AccountNames[i]); /* Look-up all well-known names */ ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); @@ -999,6 +1037,31 @@ SidsBuffer[i].DomainIndex = DomainIndex; } + else + { + DomainSid = CreateDomainSidFromAccountSid(ptr->Sid); + if (DomainSid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &EmptyDomainName, + DomainSid, + &DomainIndex); + + if (DomainSid != NULL) + { + MIDL_user_free(DomainSid); + DomainSid = NULL; + } + + if (!NT_SUCCESS(Status)) + goto done; + + SidsBuffer[i].DomainIndex = DomainIndex; + } } (*Mapped)++; @@ -1054,6 +1117,7 @@ } done: + return Status; } @@ -1428,7 +1492,6 @@ return Status; } - NTSTATUS @@ -1514,7 +1577,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1529,7 +1595,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedBuiltinNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1544,7 +1613,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedAccountNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1560,7 +1632,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupBuiltinNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1575,7 +1650,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupAccountNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done;

12 years, 2 months

[hbelusca] 57556: [CSRSRV] - Remove $Id$ property. - Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" --> "(de)reference". - Add missing functions' documentation (from the old ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 13 20:32:44 2012 New Revision: 57556 URL: http://svn.reactos.org/svn/reactos?rev=57556&view=rev Log: [CSRSRV] - Remove $Id$ property. - Correct misspellings : "othwerwise" --> "otherwise" and "(de)refence" --> "(de)reference". - Add missing functions' documentation (from the old CSRSRV). - Add some useful comments. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c (props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/session.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c (contents, props changed) trunk/reactos/subsystems/win32/csrss/csrss.c (props changed) trunk/reactos/subsystems/win32/csrss/csrss.rc (props changed) trunk/reactos/subsystems/win32/csrss/include/api.h (contents, props changed) trunk/reactos/subsystems/win32/csrss/include/csrplugin.h (contents, props changed) Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * subsystems/win32/csrss/csrsrv/api/user.c * * User functions Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * subsystems/win32/csrss/csrsrv/api/wapi.c * * CSRSS port message processing @@ -206,7 +205,9 @@ /* Return success */ return STATUS_SUCCESS; + #else // Hacky reactos code + PCSR_PROCESS ProcessData; /* Get the Process Data */ @@ -249,7 +250,7 @@ * @param None * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -298,8 +299,8 @@ /* Create the Port Object */ Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, - LPC_MAX_DATA_LENGTH, // hack - LPC_MAX_MESSAGE_LENGTH, // hack + LPC_MAX_DATA_LENGTH, // hack ; sizeof(CSR_CONNECTION_INFO), + LPC_MAX_MESSAGE_LENGTH, // hack ; sizeof(CSR_API_MESSAGE), 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) { @@ -745,7 +746,7 @@ } NTSTATUS WINAPI -CsrpHandleConnectionRequest (PPORT_MESSAGE Request) +CsrpHandleConnectionRequest(PPORT_MESSAGE Request) { NTSTATUS Status; HANDLE ServerPort = NULL;//, ServerThread = NULL; @@ -844,6 +845,19 @@ return Status; } +/*++ + * @name CsrConnectToUser + * @implemented NT4 + * + * The CsrConnectToUser connects to the User subsystem. + * + * @param None + * + * @return A pointer to the CSR Thread + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrConnectToUser(VOID) Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -3,7 +3,8 @@ * PROJECT: ReactOS CSR Sub System * FILE: subsystems/win32/csrss/csrsrv/init.c * PURPOSE: CSR Server DLL Initialization - * PROGRAMMERS: ReactOS Portable Systems Group + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -111,7 +112,7 @@ * @param None. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -226,7 +227,7 @@ * Handle fo the Object Directory to protect. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -249,7 +250,7 @@ * Pointer to the Security Descriptor to return. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks Depending on the DOS Devices Protection Mode (set in the registry), * regular users may or may not have full access to the directory. @@ -466,7 +467,7 @@ * Session ID for which to create the directories. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -597,7 +598,7 @@ * Array of arguments. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -754,6 +755,7 @@ // { // Status = CsrLoadServerDll(ParameterValue, EntryPoint, 2); // } + // Status = CsrLoadServerDll(ParameterValue, EntryPoint, DllIndex); if (!NT_SUCCESS(Status)) { DPRINT1("CSRSS: *** Failed loading ServerDll=%s (Status == 0x%x)\n", @@ -786,7 +788,7 @@ * Pointer to a pointer to the security descriptor to create. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -826,7 +828,7 @@ return Status; } - /* Create the DACL for it*/ + /* Create the DACL for it */ RtlCreateAcl(Dacl, Length, ACL_REVISION2); /* Create the ACE */ @@ -863,7 +865,7 @@ * @param None * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -945,6 +947,25 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +/*++ + * @name CsrServerInitialization + * @implemented NT4 + * + * The CsrServerInitialization routine is the native (not Server) entrypoint + * of this Server DLL. It serves as the entrypoint for csrss. + * + * @param ArgumentCount + * Number of arguments on the command line. + * + * @param Arguments + * Array of arguments from the command line. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks None. + * + *--*/ NTSTATUS NTAPI CsrServerInitialization(IN ULONG ArgumentCount, @@ -1085,11 +1106,33 @@ return Status; } +/*++ + * @name CsrPopulateDosDevices + * @unimplemented NT5.1 + * + * The CsrPopulateDosDevices routine uses the DOS Device Map from the Kernel + * to populate the Dos Devices Object Directory for the session. + * + * @param None. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrPopulateDosDevices(VOID) +{ + DPRINT1("Deprecated API\n"); + return; +} + BOOL NTAPI -DllMain(HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) +DllMain(IN HANDLE hDll, + IN DWORD dwReason, + IN LPVOID lpReserved) { /* We don't do much */ UNREFERENCED_PARAMETER(hDll); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -17,7 +17,7 @@ /* GLOBALS ********************************************************************/ RTL_CRITICAL_SECTION ProcessDataLock; -PCSR_PROCESS CsrRootProcess; +PCSR_PROCESS CsrRootProcess = NULL; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { sizeof(SECURITY_QUALITY_OF_SERVICE), @@ -25,7 +25,7 @@ SECURITY_STATIC_TRACKING, FALSE }; -LONG CsrProcessSequenceCount = 5; +ULONG CsrProcessSequenceCount = 5; extern ULONG CsrTotalPerProcessDataLength; /* FUNCTIONS ******************************************************************/ @@ -64,6 +64,26 @@ } } +/*++ + * @name CsrGetProcessLuid + * @implemented NT4 + * + * Do nothing for 500ms. + * + * @param hProcess + * Optional handle to the process whose LUID should be returned. + * + * @param Luid + * Pointer to a LUID Pointer which will receive the CSR Process' LUID + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks If hProcess is not supplied, then the current thread's token will + * be used. If that too is missing, then the current process' token + * will be used. + * + *--*/ NTSTATUS NTAPI CsrGetProcessLuid(HANDLE hProcess OPTIONAL, @@ -148,6 +168,20 @@ return Status; } +/*++ + * @name CsrImpersonateClient + * @implemented NT4 + * + * The CsrImpersonateClient will impersonate the given CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread to impersonate. + * + * @return TRUE if impersionation suceeded, false otherwise. + * + * @remarks Impersonation can be recursive. + * + *--*/ BOOLEAN NTAPI CsrImpersonateClient(IN PCSR_THREAD CsrThread) @@ -173,6 +207,10 @@ if (!NT_SUCCESS(Status)) { /* Failure */ +/* + DPRINT1("CSRSS: Can't impersonate client thread - Status = %lx\n", Status); + if (Status != STATUS_BAD_IMPERSONATION_LEVEL) DbgBreakPoint(); +*/ return FALSE; } @@ -183,6 +221,21 @@ return TRUE; } +/*++ + * @name CsrRevertToSelf + * @implemented NT4 + * + * The CsrRevertToSelf routine will attempt to remove an active impersonation. + * + * @param None. + * + * @return TRUE if the reversion was succesful, false otherwise. + * + * @remarks Impersonation can be recursive; as such, the impersonation token + * will only be deleted once the CSR Thread's impersonaton count + * has reached zero. + * + *--*/ BOOLEAN NTAPI CsrRevertToSelf(VOID) @@ -197,6 +250,7 @@ /* Make sure impersonation is on */ if (!CurrentThread->ImpersonationCount) { + // DPRINT1("CSRSS: CsrRevertToSelf called while not impersonating\n"); return FALSE; } else if (--CurrentThread->ImpersonationCount > 0) @@ -216,18 +270,33 @@ return NT_SUCCESS(Status); } +/*++ + * @name FindProcessForShutdown + * + * The FindProcessForShutdown routine returns a CSR Process which is ready + * to be shutdown, and sets the appropriate shutdown flags for it. + * + * @param CallerLuid + * Pointer to the LUID of the CSR Process calling this routine. + * + * @return Pointer to a CSR Process which is ready to be shutdown. + * + * @remarks None. + * + *--*/ PCSR_PROCESS NTAPI FindProcessForShutdown(IN PLUID CallerLuid) { PCSR_PROCESS CsrProcess, ReturnCsrProcess = NULL; + // PCSR_THREAD CsrThread; NTSTATUS Status; ULONG Level = 0; LUID ProcessLuid; LUID SystemLuid = SYSTEM_LUID; - BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; + // BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; PLIST_ENTRY NextEntry; - + /* Set the List Pointers */ NextEntry = CsrRootProcess->ListLink.Flink; while (NextEntry != &CsrRootProcess->ListLink) @@ -237,10 +306,10 @@ /* Move to the next entry */ NextEntry = NextEntry->Flink; - + /* Skip this process if it's already been processed */ if (CsrProcess->Flags & CsrProcessSkipShutdown) continue; - + /* Get the LUID of this Process */ Status = CsrGetProcessLuid(CsrProcess->ProcessHandle, &ProcessLuid); @@ -248,29 +317,41 @@ if (Status == STATUS_ACCESS_DENIED) { /* FIXME:Check if we have any threads */ - } - +/* + if (CsrProcess->ThreadCount) + { + /\* Impersonate one of the threads and retry *\/ + CsrThread = CONTAINING_RECORD(CsrProcess->ThreadList.Flink, + CSR_THREAD, + Link); + CsrImpersonateClient(CsrThread); + Status = CsrGetProcessLuid(NULL, &ProcessLuid); + CsrRevertToSelf(); + } +*/ + } + if (!NT_SUCCESS(Status)) { /* We didn't have access, so skip it */ CsrProcess->Flags |= CsrProcessSkipShutdown; continue; } - + /* Check if this is the System LUID */ - if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) + if ((/*IsSystemLuid =*/ RtlEqualLuid(&ProcessLuid, &SystemLuid))) { /* Mark this process */ CsrProcess->ShutdownFlags |= CsrShutdownSystem; } - else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) + else if (!(/*IsOurLuid =*/ RtlEqualLuid(&ProcessLuid, CallerLuid))) { /* Our LUID doesn't match with the caller's */ CsrProcess->ShutdownFlags |= CsrShutdownOther; } - + /* Check if we're past the previous level */ - if (CsrProcess->ShutdownLevel > Level) + if (CsrProcess->ShutdownLevel > Level /* || !ReturnCsrProcess */) { /* Update the level */ Level = CsrProcess->ShutdownLevel; @@ -279,14 +360,14 @@ ReturnCsrProcess = CsrProcess; } } - + /* Check if we found a process */ if (ReturnCsrProcess) { /* Skip this one next time */ ReturnCsrProcess->Flags |= CsrProcessSkipShutdown; } - + return ReturnCsrProcess; } @@ -604,7 +685,7 @@ * column. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -903,7 +984,7 @@ /*++ * @name CsrLockedReferenceProcess * - * The CsrLockedReferenceProcess refences a CSR Process while the + * The CsrLockedReferenceProcess references a CSR Process while the * Process Lock is already being held. * * @param CsrProcess @@ -923,7 +1004,7 @@ } /*++ - * @name CsrServerInitialization + * @name CsrInitializeProcessStructure * @implemented NT4 * * The CsrInitializeProcessStructure routine sets up support for CSR Processes @@ -932,7 +1013,7 @@ * @param None. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -1099,7 +1180,7 @@ * CSR Process corresponding to the given Process ID. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks Locking a CSR Process is defined as acquiring an extra * reference to it and returning with the Process Lock held. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -98,7 +98,7 @@ * assumed. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -340,7 +340,7 @@ * specifies various arguments for the shared section. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -463,7 +463,7 @@ * connection. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -192,7 +192,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbCreateSession routine will initialize a new CSR NT * Session and allocate a new CSR Process for the subsystem process. @@ -339,7 +339,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbForeignSessionComplete API is not yet implemented. * @@ -362,7 +362,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbTerminateSession API is not yet implemented. * @@ -384,7 +384,7 @@ * @param ApiMessage * Pointer to the Session Manager API Message. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks The CsrSbCreateProcess API is not yet implemented. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System * FILE: subsystems/win32/csrss/csrsrv/thredsup.c - * PURPOSE: CSR Process Management + * PURPOSE: CSR Server DLL Thread Implementation * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu */ @@ -101,6 +101,19 @@ return FALSE; } +/*++ + * @name CsrAllocateThread + * + * The CsrAllocateThread routine allocates a new CSR Thread object. + * + * @param CsrProcess + * Pointer to the CSR Process which will contain this CSR Thread. + * + * @return Pointer to the newly allocated CSR Thread. + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrAllocateThread(IN PCSR_PROCESS CsrProcess) @@ -125,7 +138,7 @@ /*++ * @name CsrLockedReferenceThread * - * The CsrLockedReferenceThread refences a CSR Thread while the + * The CsrLockedReferenceThread references a CSR Thread while the * Process Lock is already being held. * * @param CsrThread @@ -144,6 +157,26 @@ ++CsrThread->ReferenceCount; } +/*++ + * @name CsrLocateThreadByClientId + * + * The CsrLocateThreadByClientId routine locates the CSR Thread and, + * optionally, its parent CSR Process, corresponding to a Client ID. + * + * @param Process + * Optional pointer to a CSR Process pointer which will contain + * the CSR Thread's parent. + * + * @param ClientId + * Pointer to a Client ID structure containing the Unique Thread ID + * to look up. + * + * @return Pointer to the CSR Thread corresponding to this CID, or NULL if + * none was found. + * + * @remarks None. + * + *--*/ PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, @@ -152,6 +185,7 @@ ULONG i; PLIST_ENTRY ListHead, NextEntry; PCSR_THREAD FoundThread; + // ASSERT(ProcessStructureListLocked()); /* Hash the Thread */ i = CsrHashThread(ClientId->UniqueThread); @@ -185,6 +219,27 @@ return NULL; } +/*++ + * @name CsrLocateThreadInProcess + * + * The CsrLocateThreadInProcess routine locates the CSR Thread + * corresponding to a Client ID inside a specific CSR Process. + * + * @param Process + * Optional pointer to the CSR Process which contains the CSR Thread + * that will be looked up. + * + * @param ClientId + * Pointer to a Client ID structure containing the Unique Thread ID + * to look up. + * + * @return Pointer to the CSR Thread corresponding to this CID, or NULL if + * none was found. + * + * @remarks If the CsrProcess argument is NULL, the lookup will be done inside + * CsrRootProcess. + * + *--*/ PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSR_PROCESS CsrProcess OPTIONAL, @@ -219,12 +274,30 @@ return FoundThread; } +/*++ + * @name CsrInsertThread + * + * The CsrInsertThread routine inserts a CSR Thread into its parent's + * Thread List and into the Thread Hash Table. + * + * @param Process + * Pointer to the CSR Process containing this CSR Thread. + * + * @param Thread + * Pointer to the CSR Thread to be inserted. + * + * @return None. + * + * @remarks None. + * + *--*/ VOID NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread) { ULONG i; + // ASSERT(ProcessStructureListLocked()); /* Insert it into the Regular List */ InsertTailList(&Process->ThreadList, &Thread->Link); @@ -240,14 +313,49 @@ InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); } +/*++ + * @name CsrDeallocateThread + * + * The CsrDeallocateThread frees the memory associated with a CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread to be freed. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Thread has been cleanly + * dereferenced and killed. + * + *--*/ VOID NTAPI CsrDeallocateThread(IN PCSR_THREAD CsrThread) { /* Free the process object from the heap */ + // ASSERT(CsrThread->WaitBlock == NULL); RtlFreeHeap(CsrHeap, 0, CsrThread); } +/*++ + * @name CsrRemoveThread + * + * The CsrRemoveThread function undoes a CsrInsertThread operation and + * removes the CSR Thread from the the Hash Table and Thread List. + * + * @param CsrThread + * Pointer to the CSR Thread to remove. + * + * @return None. + * + * @remarks If this CSR Thread is the last one inside a CSR Process, the + * parent will be dereferenced and the CsrProcessLastThreadTerminated + * flag will be set. + * + * After executing this routine, the CSR Thread will have the + * CsrThreadInTermination flag set. + * + *--*/ VOID NTAPI CsrRemoveThread(IN PCSR_THREAD CsrThread) @@ -297,7 +405,7 @@ * with this CSR Thread. * * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. + * otherwise. * * @remarks None. * @@ -382,6 +490,24 @@ return STATUS_SUCCESS; } +/*++ + * @name CsrThreadRefcountZero + * + * The CsrThreadRefcountZero routine is executed when a CSR Thread has lost + * all its active references. It removes and de-allocates the CSR Thread. + * + * @param CsrThread + * Pointer to the CSR Thread that is to be deleted. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Thread has lost all + * its references. + * + * This routine is called with the Process Lock held. + * + *--*/ VOID NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) @@ -483,7 +609,7 @@ /*++ * @name CsrLockedDereferenceThread * - * The CsrLockedDereferenceThread derefences a CSR Thread while the + * The CsrLockedDereferenceThread dereferences a CSR Thread while the * Process Lock is already being held. * * @param CsrThread @@ -511,6 +637,29 @@ } } +/*++ + * @name CsrCreateThread + * @implemented NT4 + * + * The CsrCreateThread routine creates a CSR Thread object for an NT Thread. + * + * @param CsrProcess + * Pointer to the CSR Process which will contain the CSR Thread. + * + * @param hThread + * Handle to an existing NT Thread to which to associate this + * CSR Thread. + * + * @param ClientId + * Pointer to the Client ID structure of the NT Thread to associate + * with this CSR Thread. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * otherwise. + * + * @remarks None. + * + *--*/ NTSTATUS NTAPI CsrCreateThread(IN PCSR_PROCESS CsrProcess, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -40,7 +40,7 @@ * @param NewWaitBlock * Pointed to the initialized CSR Wait Block for this wait. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks None. * @@ -262,7 +262,7 @@ * @name CsrDereferenceWait * @implemented NT4 * - * The CsrDereferenceWait routine derefences a CSR Wait Block. + * The CsrDereferenceWait routine dereferences a CSR Wait Block. * * @param WaitList * Pointer to the Wait List associated to the wait. @@ -394,7 +394,7 @@ * @param WaitArgument[1-2] * User-defined argument to pass on to the wait function. * - * @return TRUE in case of success, FALSE othwerwise. + * @return TRUE in case of success, FALSE otherwise. * * @remarks None. * Propchange: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/subsystems/win32/csrss/csrss.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/subsystems/win32/csrss/csrss.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: subsys/csrss/include/api.h Propchange: trunk/reactos/subsystems/win32/csrss/include/api.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Sat Oct 13 20:32:44 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: subsys/csrss/include/csrplugin.h Propchange: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

12 years, 2 months

[hbelusca] 57555: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 13 18:19:31 2012 New Revision: 57555 URL: http://svn.reactos.org/svn/reactos?rev=57555&view=rev Log: [USER32] - Change the French keyboard accelerators of the windows' system menu to match those of Win2k3. Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/f… ============================================================================== --- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc [iso-8859-1] Sat Oct 13 18:19:31 2012 @@ -44,10 +44,10 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN MENUITEM "&Restaurer", SC_RESTORE - MENUITEM "&DÃ©placer", SC_MOVE + MENUITEM "DÃ©p&lacer", SC_MOVE MENUITEM "&Taille", SC_SIZE - MENUITEM "RÃ©&duire", SC_MINIMIZE - MENUITEM "A&grandir", SC_MAXIMIZE + MENUITEM "RÃ©d&uire", SC_MINIMIZE + MENUITEM "Agra&ndir", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "&Fermer\tAlt-F4", SC_CLOSE END

12 years, 2 months

[spetreolle] 57554: [BOOTDATA] Clean up svn properties.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Oct 13 16:22:48 2012 New Revision: 57554 URL: http://svn.reactos.org/svn/reactos?rev=57554&view=rev Log: [BOOTDATA] Clean up svn properties. Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf (props changed) trunk/reactos/boot/bootdata/hivecls_i386.inf (props changed) trunk/reactos/boot/bootdata/hivedef_arm.inf (props changed) trunk/reactos/boot/bootdata/hivedef_i386.inf (props changed) trunk/reactos/boot/bootdata/hiveinst_arm.inf (props changed) trunk/reactos/boot/bootdata/hiveinst_i386.inf (props changed) trunk/reactos/boot/bootdata/hivesft_arm.inf (props changed) trunk/reactos/boot/bootdata/hivesft_i386.inf (props changed) trunk/reactos/boot/bootdata/hivesys_arm.inf (props changed) trunk/reactos/boot/bootdata/hivesys_i386.inf (props changed) Propchange: trunk/reactos/boot/bootdata/hivecls_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivecls_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivedef_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivedef_i386.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1,1 +1,0 @@ -application/octet-stream Propchange: trunk/reactos/boot/bootdata/hiveinst_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hiveinst_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesft_i386.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1,1 +1,0 @@ -application/octet-stream Propchange: trunk/reactos/boot/bootdata/hivesys_arm.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/boot/bootdata/hivesys_i386.inf ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

12 years, 2 months

[hbelusca] 57553: [RAPPS] - Use COM for calling SHBrowseForFolder. - Allow choosing a directory for downloading. - Correct a typo in the name of a function.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 13 13:35:55 2012 New Revision: 57553 URL: http://svn.reactos.org/svn/reactos?rev=57553&view=rev Log: [RAPPS] - Use COM for calling SHBrowseForFolder. - Allow choosing a directory for downloading. - Correct a typo in the name of a function. Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -29,7 +29,7 @@ set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -115,7 +115,7 @@ extern INT SelectedEnumType; extern SETTINGS_INFO SettingsInfo; VOID SaveSettings(HWND hwnd); -VOID FillDafaultSettings(PSETTINGS_INFO pSettingsInfo); +VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); /* listview.c */ extern HWND hListView; Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -6,6 +6,7 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) */ +#define _WIN32_DCOM // For CoInitializeEx, etc... #include "rapps.h" SETTINGS_INFO NewSettingsInfo; @@ -16,27 +17,35 @@ BOOL ChooseFolder(HWND hwnd) { - BROWSEINFO fi; - LPCITEMIDLIST lpItemList; + BOOL bRet = FALSE; + BROWSEINFO bi; WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN]; LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - ZeroMemory(&fi, sizeof(BROWSEINFO)); - fi.hwndOwner = hwnd; - fi.lpszTitle = szBuf; - fi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | BIF_BROWSEFORCOMPUTER | BIF_NEWDIALOGSTYLE; - fi.lpfn = NULL; - fi.lParam = -1; - fi.iImage = 0; + ZeroMemory(&bi, sizeof(bi)); + bi.hwndOwner = hwnd; + bi.pidlRoot = NULL; + bi.lpszTitle = szBuf; + bi.ulFlags = BIF_USENEWUI | BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | /* BIF_BROWSEFILEJUNCTIONS | */ BIF_VALIDATE; - if (!(lpItemList = SHBrowseForFolder(&fi))) return FALSE; - SHGetPathFromIDList(lpItemList, szPath); + if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) + { + LPITEMIDLIST lpItemList = SHBrowseForFolder(&bi); + if (lpItemList && SHGetPathFromIDList(lpItemList, szPath)) + { + if (szPath[0] != 0) + { + SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath); + bRet = TRUE; + } + } - if (wcslen(szPath) == 0) return FALSE; - SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath); + CoTaskMemFree(lpItemList); + CoUninitialize(); + } - return TRUE; + return bRet; } static VOID @@ -89,7 +98,7 @@ break; case IDC_DEFAULT_SETTINGS: - FillDafaultSettings(&NewSettingsInfo); + FillDefaultSettings(&NewSettingsInfo); InitSettingsControls(hDlg, NewSettingsInfo); break; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Oct 13 13:35:55 2012 @@ -16,7 +16,7 @@ VOID -FillDafaultSettings(PSETTINGS_INFO pSettingsInfo) +FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; @@ -782,7 +782,7 @@ if (!LoadSettings()) { - FillDafaultSettings(&SettingsInfo); + FillDefaultSettings(&SettingsInfo); } InitLogs();

12 years, 2 months

[tkreuzer] 57552: [RTL] Implement LdrEnumResources

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 13 13:32:49 2012 New Revision: 57552 URL: http://svn.reactos.org/svn/reactos?rev=57552&view=rev Log: [RTL] Implement LdrEnumResources Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=57552&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sat Oct 13 13:32:49 2012 @@ -283,18 +283,220 @@ } -/* - * @unimplemented - */ +#define NAME_FROM_RESOURCE_ENTRY(RootDirectory, Entry) \ + ((Entry)->NameIsString ? (ULONG_PTR)(RootDirectory) + (Entry)->NameOffset : (Entry)->Id) + +static +LONG +LdrpCompareResourceNames_U( + _In_ PUCHAR ResourceData, + _In_ PIMAGE_RESOURCE_DIRECTORY_ENTRY Entry, + _In_ ULONG_PTR CompareName) +{ + PIMAGE_RESOURCE_DIR_STRING_U ResourceString; + PWSTR String1, String2; + USHORT ResourceStringLength; + WCHAR Char1, Char2; + + /* Check if the resource name is an ID */ + if (CompareName <= USHRT_MAX) + { + /* Just compare the 2 IDs */ + return (CompareName - Entry->Id); + } + else + { + /* Fail if ResourceName2 is an ID */ + if (Entry->Id <= USHRT_MAX) return -1; + + /* Get the resource string */ + ResourceString = (PIMAGE_RESOURCE_DIR_STRING_U)(ResourceData + + Entry->NameOffset); + + /* Get the string length */ + ResourceStringLength = ResourceString->Length; + + String1 = ResourceString->NameString; + String2 = (PWSTR)CompareName; + + /* Loop all characters of the resource string */ + while (ResourceStringLength--) + { + /* Get the next characters */ + Char1 = *String1++; + Char2 = *String2++; + + /* Check if they don't match, or if the compare string ends */ + if ((Char1 != Char2) || (Char2 == 0)) + { + /* They don't match, fail */ + return Char2 - Char1; + } + } + + /* All characters match, check if the compare string ends here */ + return (*String2 == 0) ? 0 : 1; + } +} + NTSTATUS NTAPI LdrEnumResources( - IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT PULONG ResourceCount, - OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + _In_ PVOID ImageBase, + _In_ PLDR_RESOURCE_INFO ResourceInfo, + _In_ ULONG Level, + _Inout_ ULONG *ResourceCount, + _Out_opt_ LDR_ENUM_RESOURCE_INFO *Resources) +{ + PUCHAR ResourceData; + NTSTATUS Status; + ULONG i, j, k; + ULONG NumberOfTypeEntries, NumberOfNameEntries, NumberOfLangEntries; + ULONG Count, MaxResourceCount; + PIMAGE_RESOURCE_DIRECTORY TypeDirectory, NameDirectory, LangDirectory; + PIMAGE_RESOURCE_DIRECTORY_ENTRY TypeEntry, NameEntry, LangEntry; + PIMAGE_RESOURCE_DATA_ENTRY DataEntry; + ULONG Size; + LONG Result; + + /* If the caller wants data, get the maximum count of entries */ + MaxResourceCount = (Resources != NULL) ? *ResourceCount : 0; + + /* Default to 0 */ + *ResourceCount = 0; + + /* Locate the resource directory */ + ResourceData = RtlImageDirectoryEntryToData(ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_RESOURCE, + &Size); + if (ResourceData == NULL) + return STATUS_RESOURCE_DATA_NOT_FOUND; + + /* The type directory is at the root, followed by the entries */ + TypeDirectory = (PIMAGE_RESOURCE_DIRECTORY)ResourceData; + TypeEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(TypeDirectory + 1); + + /* Get the number of entries in the type directory */ + NumberOfTypeEntries = TypeDirectory->NumberOfNamedEntries + + TypeDirectory->NumberOfIdEntries; + + /* Start with 0 resources and status success */ + Status = STATUS_SUCCESS; + Count = 0; + + /* Loop all entries in the type directory */ + for (i = 0; i < NumberOfTypeEntries; ++i, ++TypeEntry) + { + /* Check if comparison of types is requested */ + if (Level > RESOURCE_TYPE_LEVEL) + { + /* Compare the type with the requested Type */ + Result = LdrpCompareResourceNames_U(ResourceData, + TypeEntry, + ResourceInfo->Type); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* The entry must point to the name directory */ + if (!TypeEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the name subdirectory and it's first entry */ + NameDirectory = (PIMAGE_RESOURCE_DIRECTORY)(ResourceData + + TypeEntry->OffsetToDirectory); + NameEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(NameDirectory + 1); + + /* Get the number of entries in the name directory */ + NumberOfNameEntries = NameDirectory->NumberOfNamedEntries + + NameDirectory->NumberOfIdEntries; + + /* Loop all entries in the name directory */ + for (j = 0; j < NumberOfNameEntries; ++j, ++NameEntry) + { + /* Check if comparison of names is requested */ + if (Level > RESOURCE_NAME_LEVEL) + { + /* Compare the name with the requested name */ + Result = LdrpCompareResourceNames_U(ResourceData, + NameEntry, + ResourceInfo->Name); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* The entry must point to the language directory */ + if (!NameEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the language subdirectory and it's first entry */ + LangDirectory = (PIMAGE_RESOURCE_DIRECTORY)(ResourceData + + NameEntry->OffsetToDirectory); + LangEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(LangDirectory + 1); + + /* Get the number of entries in the language directory */ + NumberOfLangEntries = LangDirectory->NumberOfNamedEntries + + LangDirectory->NumberOfIdEntries; + + /* Loop all entries in the language directory */ + for (k = 0; k < NumberOfLangEntries; ++k, ++LangEntry) + { + /* Check if comparison of languages is requested */ + if (Level > RESOURCE_LANGUAGE_LEVEL) + { + /* Compare the language with the requested language */ + Result = LdrpCompareResourceNames_U(ResourceData, + LangEntry, + ResourceInfo->Language); + + /* Not equal, continue with next entry */ + if (Result != 0) continue; + } + + /* This entry must point to data */ + if (LangEntry->DataIsDirectory) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get a pointer to the data entry */ + DataEntry = (PIMAGE_RESOURCE_DATA_ENTRY)(ResourceData + + LangEntry->OffsetToData); + + /* Check if there is still space to store the data */ + if (Count < MaxResourceCount) + { + /* There is, fill the entry */ + Resources[Count].Type = + NAME_FROM_RESOURCE_ENTRY(ResourceData, TypeEntry); + Resources[Count].Name = + NAME_FROM_RESOURCE_ENTRY(ResourceData, NameEntry); + Resources[Count].Language = + NAME_FROM_RESOURCE_ENTRY(ResourceData, LangEntry); + Resources[Count].Data = (PUCHAR)ImageBase + DataEntry->OffsetToData; + Resources[Count].Reserved = 0; + Resources[Count].Size = DataEntry->Size; + } + else + { + /* There is not enough space, save error status */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Count this resource */ + ++Count; + } + } + } + + /* Return the number of matching resources */ + *ResourceCount = Count; + return Status; +}

12 years, 2 months

[tkreuzer] 57551: [[NTDLL_APITEST} Fix a bug

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 13 13:09:15 2012 New Revision: 57551 URL: http://svn.reactos.org/svn/reactos?rev=57551&view=rev Log: [[NTDLL_APITEST} Fix a bug Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumRes… ============================================================================== --- trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Sat Oct 13 13:09:15 2012 @@ -182,7 +182,7 @@ ResourceDirectory->VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); ResourceDirectory->Size = sizeof(TEST_RESOURCES); - strcpy(TestImage->SectionHeaders[0].Name, ".rsrc"); + strcpy((char*)TestImage->SectionHeaders[0].Name, ".rsrc"); TestImage->SectionHeaders[0].Misc.VirtualSize = sizeof(TEST_IMAGE); TestImage->SectionHeaders[0].VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); TestImage->SectionHeaders[0].SizeOfRawData = sizeof(TEST_IMAGE);

12 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
22
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 October 2012