Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58167: [WINSRV] Compile Winsrv as a win32dll UNICODE
by hbelusca＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: hbelusca Date: Sun Jan 13 19:17:29 2013 New Revision: 58167 URL: http://svn.reactos.org/svn/reactos?rev=58167&view=rev Log: [WINSRV] Compile Winsrv as a win32dll UNICODE Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/C… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sun Jan 13 19:17:29 2013 @@ -17,7 +17,7 @@ target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() -set_module_type(winsrv win32dll) +set_module_type(winsrv win32dll UNICODE) # add_importlibs(winsrv psapi msvcrt kernel32 ntdll csrsrv) add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv)

1 0

[hbelusca] 58166: [KERNEL32] - Correct a error return code (in AllocConsole). - Implement AttachConsole (inspired by AllocConsole). [CONSRV] - Correct a error return code (in AllocConsole). - Intro...
by hbelusca＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: hbelusca Date: Sun Jan 13 17:07:25 2013 New Revision: 58166 URL: http://svn.reactos.org/svn/reactos?rev=58166&view=rev Log: [KERNEL32] - Correct a error return code (in AllocConsole). - Implement AttachConsole (inspired by AllocConsole). [CONSRV] - Correct a error return code (in AllocConsole). - Introduce helper functions to simplify console-initialization code. - Implement server-side of AttachConsole (I used pieces of code from ConsoleNewProcess, ConsoleConnect and SrvAllocConsole). Some debug prints were introduced (for debug-purposes :P), will be removed when all things work. TODO: have a look on the handles code. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -802,8 +802,8 @@ if (NtCurrentPeb()->ProcessParameters->ConsoleHandle) { - DPRINT("AllocConsole: Allocate duplicate console to the same Process\n"); - BaseSetLastNTError (STATUS_OBJECT_NAME_EXISTS); + DPRINT1("AllocConsole: Allocate duplicate console to the same Process\n"); + SetLastError(ERROR_ACCESS_DENIED); return FALSE; } @@ -824,7 +824,6 @@ } NtCurrentPeb()->ProcessParameters->ConsoleHandle = AllocConsoleRequest->Console; - SetStdHandle(STD_INPUT_HANDLE , AllocConsoleRequest->InputHandle ); SetStdHandle(STD_OUTPUT_HANDLE, AllocConsoleRequest->OutputHandle); SetStdHandle(STD_ERROR_HANDLE , AllocConsoleRequest->ErrorHandle ); @@ -1910,13 +1909,50 @@ /*-------------------------------------------------------------- * AttachConsole * - * @unimplemented + * @implemented + * + * @note Strongly inspired by AllocConsole. */ BOOL WINAPI AttachConsole(DWORD dwProcessId) { - DPRINT1("AttachConsole(0x%x) UNIMPLEMENTED!\n", dwProcessId); + NTSTATUS Status; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_ATTACHCONSOLE AttachConsoleRequest = &ApiMessage.Data.AttachConsoleRequest; + + DPRINT1("AttachConsole(%lu)\n", dwProcessId); + + if (NtCurrentPeb()->ProcessParameters->ConsoleHandle) + { + DPRINT1("AttachConsole: Attaching a console to a process already having one\n"); + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + AttachConsoleRequest->ProcessId = dwProcessId; + AttachConsoleRequest->CtrlDispatcher = ConsoleControlDispatcher; + + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepAttach), + sizeof(CONSOLE_ATTACHCONSOLE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + NtCurrentPeb()->ProcessParameters->ConsoleHandle = AttachConsoleRequest->Console; + SetStdHandle(STD_INPUT_HANDLE , AttachConsoleRequest->InputHandle ); + SetStdHandle(STD_OUTPUT_HANDLE, AttachConsoleRequest->OutputHandle); + SetStdHandle(STD_ERROR_HANDLE , AttachConsoleRequest->ErrorHandle ); + + /* Initialize Console Ctrl Handler */ + InitConsoleCtrlHandling(); + + InputWaitHandle = AttachConsoleRequest->InputWaitHandle; + return TRUE; } Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -102,7 +102,7 @@ // ConsolepRegisterConsoleIME, // ConsolepUnregisterConsoleIME, // ConsolepGetLangId, - // ConsolepAttach, + ConsolepAttach, ConsolepGetSelectionInfo, ConsolepGetProcessList, ConsolepGetHistory, @@ -176,6 +176,17 @@ HANDLE InputWaitHandle; LPTHREAD_START_ROUTINE CtrlDispatcher; } CONSOLE_ALLOCCONSOLE, *PCONSOLE_ALLOCCONSOLE; + +typedef struct +{ + DWORD ProcessId; // If ProcessId == ATTACH_PARENT_PROCESS == -1, then attach the current process to its parent process console. + HANDLE Console; // ConsoleHandle // In fact, it is a PCSRSS_CONSOLE <-- correct that !! + HANDLE InputHandle; + HANDLE OutputHandle; + HANDLE ErrorHandle; + HANDLE InputWaitHandle; + LPTHREAD_START_ROUTINE CtrlDispatcher; +} CONSOLE_ATTACHCONSOLE, *PCONSOLE_ATTACHCONSOLE; typedef struct { @@ -543,6 +554,7 @@ union { CONSOLE_ALLOCCONSOLE AllocConsoleRequest; + CONSOLE_ATTACHCONSOLE AttachConsoleRequest; CONSOLE_FREECONSOLE FreeConsoleRequest; /* Handles */ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -301,57 +301,51 @@ if (ProcessData->Console != NULL) { DPRINT1("Process already has a console\n"); - return STATUS_INVALID_PARAMETER; - } - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - + return STATUS_ACCESS_DENIED; + } + +/******************************************************************************/ +/** This comes from ConsoleConnect!! **/ DPRINT1("SrvAllocConsole - Checkpoint 1\n"); - - /* Initialize a new Console owned by the Console Leader Process */ - Status = CsrInitConsole(&ProcessData->Console, AllocConsoleRequest->ShowCmd, ConsoleLeader); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Console initialization failed\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Status; - } - - /* Insert the process into the processes list of the console */ - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); - - /* Return it to the caller */ - AllocConsoleRequest->Console = ProcessData->Console; - - /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&ProcessData->Console->ReferenceCount); #if 0000 /* - * We've just created a new console. However when ConsoleNewProcess was - * called, we didn't know that we wanted to create a new console and + * We are about to create a new console. However when ConsoleNewProcess + * was called, we didn't know that we wanted to create a new console and * therefore, we by default inherited the handles table from our parent * process. It's only now that we notice that in fact we do not need * them, because we've created a new console and thus we must use it. * - * Therefore, free our handles table and recreate a new one. + * Therefore, free the console we can have and our handles table, + * and recreate a new one later on. */ - - ULONG i; - - /* Close all console handles and free the handle table memory */ - for (i = 0; i < ProcessData->HandleTableSize; i++) - { - Win32CsrCloseHandleEntry(&ProcessData->HandleTable[i]); - } - ProcessData->HandleTableSize = 0; - RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); - ProcessData->HandleTable = NULL; + Win32CsrReleaseConsole(ProcessData); + // Win32CsrFreeHandlesTable(ProcessData); #endif + + /* Initialize a new Console owned by the Console Leader Process */ + Status = CsrInitConsole(&ProcessData->Console, AllocConsoleRequest->ShowCmd, ConsoleLeader); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Console initialization failed\n"); + return Status; + } + + /* Add a reference count because the process is tied to the console */ + _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + + /* Insert the process into the processes list of the console */ + InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); + + /* Return it to the caller */ + AllocConsoleRequest->Console = ProcessData->Console; + /* * Create a new handle table - Insert the IO handles */ + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); /* Insert the Input handle */ Status = Win32CsrInsertObject(ProcessData, @@ -363,9 +357,10 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the input handle\n"); - ConioDeleteConsole(ProcessData->Console); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } @@ -379,11 +374,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the output handle\n"); - ConioDeleteConsole(ProcessData->Console); - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->InputHandle); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->InputHandle); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } @@ -397,15 +393,18 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the error handle\n"); - ConioDeleteConsole(ProcessData->Console); - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->OutputHandle); - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->InputHandle); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->OutputHandle); + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->InputHandle); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); /* Duplicate the Event */ Status = NtDuplicateObject(NtCurrentProcess(), @@ -416,18 +415,18 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); - ConioDeleteConsole(ProcessData->Console); - // if (NewConsole /* || !ProcessData->bInheritHandles */) - { - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->ErrorHandle); - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->OutputHandle); - Win32CsrReleaseObject(ProcessData, - AllocConsoleRequest->InputHandle); - } - ProcessData->Console = NULL; - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // if (NewConsole) + // { + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->ErrorHandle); + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->OutputHandle); + // Win32CsrReleaseObject(ProcessData, + // AllocConsoleRequest->InputHandle); + // } + // ConioDeleteConsole(ProcessData->Console); // FIXME: Just release the console ? + // ProcessData->Console = NULL; return Status; } /* Input Wait Handle */ @@ -436,15 +435,149 @@ /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher; DPRINT("CONSRV: CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); +/******************************************************************************/ + return STATUS_SUCCESS; } +CSR_API(SrvAttachConsole) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE_ATTACHCONSOLE AttachConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.AttachConsoleRequest; + PCSR_PROCESS SourceProcess = NULL; // The parent process. + PCSR_PROCESS TargetProcess = CsrGetClientThread()->Process; // Ourselves. + HANDLE ProcessId = ULongToHandle(AttachConsoleRequest->ProcessId); + PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData; + + DPRINT("SrvAttachConsole\n"); + + TargetProcessData = ConsoleGetPerProcessData(TargetProcess); + + if (TargetProcessData->Console != NULL) + { + DPRINT1("Process already has a console\n"); + return STATUS_ACCESS_DENIED; + } + + if (ProcessId == ULongToHandle(ATTACH_PARENT_PROCESS)) + { + PROCESS_BASIC_INFORMATION ProcessInfo; + ULONG Length = sizeof(ProcessInfo); + + /* Get the real parent's ID */ + + Status = NtQueryInformationProcess(TargetProcess->ProcessHandle, + ProcessBasicInformation, + &ProcessInfo, + Length, &Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SrvAttachConsole - Cannot retrieve basic process info, Status = %lu\n", Status); + return Status; + } + + DPRINT("We, process (ID) %lu;%lu\n", TargetProcess->ClientId.UniqueProcess, TargetProcess->ClientId.UniqueThread); + ProcessId = ULongToHandle(ProcessInfo.InheritedFromUniqueProcessId); + DPRINT("Parent process ID = %lu\n", ProcessId); + } + + /* Lock the target process via its PID */ + DPRINT1("Lock process Id %lu\n", ProcessId); + Status = CsrLockProcessByClientId(ProcessId, &SourceProcess); + DPRINT1("Lock process Status %lu\n", Status); + if (!NT_SUCCESS(Status)) return Status; + DPRINT1("AttachConsole OK\n"); + +/******************************************************************************/ +/** This comes from ConsoleNewProcess!! **/ + SourceProcessData = ConsoleGetPerProcessData(SourceProcess); + + /* + * Inherit the console from the parent, + * if any, otherwise return an error. + */ + DPRINT1("SourceProcessData->Console = 0x%p\n", SourceProcessData->Console); + if (SourceProcessData->Console == NULL) + { + Status = STATUS_INVALID_HANDLE; + goto Quit; + } + TargetProcessData->Console = SourceProcessData->Console; + + DPRINT1("SrvAttachConsole - Copy the handle table (1)\n"); + Status = Win32CsrInheritHandlesTable(SourceProcessData, TargetProcessData); + DPRINT1("SrvAttachConsole - Copy the handle table (2)\n"); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + +/******************************************************************************/ + +/******************************************************************************/ +/** This comes from ConsoleConnect / SrvAllocConsole!! **/ + /* Add a reference count because the process is tied to the console */ + _InterlockedIncrement(&TargetProcessData->Console->ReferenceCount); + + /* Insert the process into the processes list of the console */ + InsertHeadList(&TargetProcessData->Console->ProcessList, &TargetProcessData->ConsoleLink); + + /* Return it to the caller */ + AttachConsoleRequest->Console = TargetProcessData->Console; + + /** Here, we inherited the console handles from the "source" process, + ** so no need to reinitialize the handles table. **/ + + DPRINT1("SrvAttachConsole - Checkpoint\n"); + + /* Duplicate the Event */ + Status = NtDuplicateObject(NtCurrentProcess(), + TargetProcessData->Console->ActiveEvent, + TargetProcessData->Process->ProcessHandle, + &TargetProcessData->ConsoleEvent, + EVENT_ALL_ACCESS, 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateObject() failed: %lu\n", Status); + Win32CsrReleaseConsole(TargetProcessData); +// #if 0 + // if (NewConsole) + // { + // Win32CsrReleaseObject(TargetProcessData, + // AttachConsoleRequest->ErrorHandle); + // Win32CsrReleaseObject(TargetProcessData, + // AttachConsoleRequest->OutputHandle); + // Win32CsrReleaseObject(TargetProcessData, + // AttachConsoleRequest->InputHandle); + // } +// #endif + // ConioDeleteConsole(TargetProcessData->Console); // FIXME: Just release the console ? + // TargetProcessData->Console = NULL; + goto Quit; + } + /* Input Wait Handle */ + AttachConsoleRequest->InputWaitHandle = TargetProcessData->ConsoleEvent; + + /* Set the Ctrl Dispatcher */ + TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher; + DPRINT("CONSRV: CtrlDispatcher address: %x\n", TargetProcessData->CtrlDispatcher); + + Status = STATUS_SUCCESS; +/******************************************************************************/ + +Quit: + DPRINT1("SrvAttachConsole - exiting 1\n"); + /* Unlock the "source" process */ + CsrUnlockProcess(SourceProcess); + DPRINT1("SrvAttachConsole - exiting 2\n"); + + return Status; +} + CSR_API(SrvFreeConsole) { DPRINT1("SrvFreeConsole\n"); - Win32CsrReleaseConsole(CsrGetClientThread()->Process); + Win32CsrReleaseConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process)); return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -73,7 +73,6 @@ /* PCONSOLE */ struct _CONSOLE* Console; /* PCONSOLE */ struct _CONSOLE* ParentConsole; - // BOOL bInheritHandles; BOOL ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. RTL_CRITICAL_SECTION HandleTableLock; @@ -118,6 +117,7 @@ /* console.c */ CSR_API(SrvOpenConsole); CSR_API(SrvAllocConsole); +CSR_API(SrvAttachConsole); CSR_API(SrvFreeConsole); CSR_API(SrvSetConsoleMode); CSR_API(SrvGetConsoleMode); @@ -139,6 +139,9 @@ CSR_API(SrvDuplicateHandle); /// CSR_API(CsrGetInputWaitHandle); +NTSTATUS FASTCALL Win32CsrInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, + IN PCONSOLE_PROCESS_DATA TargetProcessData); +VOID FASTCALL Win32CsrFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS FASTCALL Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, @@ -153,6 +156,7 @@ VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCONSOLE_PROCESS_DATA ProcessData, HANDLE Handle); +VOID FASTCALL Win32CsrReleaseConsole(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess, PCSR_PROCESS TargetProcess); @@ -160,7 +164,6 @@ IN OUT PVOID ConnectionInfo, IN OUT PULONG ConnectionInfoLength); VOID NTAPI ConsoleDisconnect(PCSR_PROCESS Process); -VOID NTAPI Win32CsrReleaseConsole(PCSR_PROCESS Process); /* lineinput.c */ CSR_API(SrvGetConsoleCommandHistoryLength); Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -81,6 +81,85 @@ NTSTATUS FASTCALL +Win32CsrInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, + IN PCONSOLE_PROCESS_DATA TargetProcessData) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG i; + + RtlEnterCriticalSection(&SourceProcessData->HandleTableLock); + + /* Inherit a handles table only if there is no already */ + if (TargetProcessData->HandleTable != NULL /* || TargetProcessData->HandleTableSize != 0 */) + { + Status = STATUS_UNSUCCESSFUL; /* STATUS_INVALID_PARAMETER */ + goto Quit; + } + + /* Allocate a new handle table for the child process */ + TargetProcessData->HandleTable = RtlAllocateHeap(ConSrvHeap, + HEAP_ZERO_MEMORY, + SourceProcessData->HandleTableSize + * sizeof(CONSOLE_IO_HANDLE)); + if (TargetProcessData->HandleTable == NULL) + { + Status = STATUS_NO_MEMORY; + goto Quit; + } + + TargetProcessData->HandleTableSize = SourceProcessData->HandleTableSize; + + /* + * Parse the parent process' handles table and, for each handle, + * do a copy of it and reference it, if the handle is inheritable. + */ + for (i = 0; i < SourceProcessData->HandleTableSize; i++) + { + if (SourceProcessData->HandleTable[i].Object != NULL && + SourceProcessData->HandleTable[i].Inheritable) + { + /* + * Copy the handle data and increment the reference count of the + * pointed object (via the call to Win32CsrCreateHandleEntry). + */ + TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; + Win32CsrCreateHandleEntry(&TargetProcessData->HandleTable[i]); + } + } + +Quit: + RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); + return Status; +} + +VOID +FASTCALL +Win32CsrFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData) +{ + DPRINT1("Win32CsrFreeHandlesTable\n"); + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + if (ProcessData->HandleTable != NULL) + { + ULONG i; + + /* Close all console handles and free the handle table memory */ + for (i = 0; i < ProcessData->HandleTableSize; i++) + { + Win32CsrCloseHandleEntry(&ProcessData->HandleTable[i]); + } + RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); + ProcessData->HandleTable = NULL; + } + + ProcessData->HandleTableSize = 0; + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); +} + +NTSTATUS +FASTCALL Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, @@ -122,7 +201,8 @@ ProcessData->HandleTable[i].Inheritable = Inheritable; ProcessData->HandleTable[i].ShareMode = ShareMode; Win32CsrCreateHandleEntry(&ProcessData->HandleTable[i]); - *Handle = UlongToHandle((i << 2) | 0x3); + *Handle = ULongToHandle((i << 2) | 0x3); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; } @@ -202,9 +282,33 @@ Win32CsrUnlockConsole(Object->Console); } - - -/** Remark: this function can be called by SrvAttachConsole (not yet implemented) **/ +VOID +FASTCALL +Win32CsrReleaseConsole(PCONSOLE_PROCESS_DATA ProcessData) +{ + PCONSOLE Console; + + DPRINT1("Win32CsrReleaseConsole\n"); + + /* Close all console handles and free the handle table memory */ + Win32CsrFreeHandlesTable(ProcessData); + + /* Detach process from console */ + Console = ProcessData->Console; + if (Console != NULL) + { + DPRINT1("Win32CsrReleaseConsole - Console->ReferenceCount = %lu - We are going to decrement it !\n", Console->ReferenceCount); + ProcessData->Console = NULL; + EnterCriticalSection(&Console->Lock); + RemoveEntryList(&ProcessData->ConsoleLink); + Win32CsrUnlockConsole(Console); + //CloseHandle(ProcessData->ConsoleEvent); + //ProcessData->ConsoleEvent = NULL; + } +} + + + NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess, @@ -223,7 +327,6 @@ **************************************************************************/ PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData; - ULONG i; DPRINT1("ConsoleNewProcess inside\n"); DPRINT1("SourceProcess = 0x%p ; TargetProcess = 0x%p\n", SourceProcess, TargetProcess); @@ -243,14 +346,13 @@ TargetProcessData->Process = TargetProcess; TargetProcessData->ConsoleEvent = NULL; TargetProcessData->Console = TargetProcessData->ParentConsole = NULL; - // TargetProcessData->bInheritHandles = FALSE; TargetProcessData->ConsoleApp = ((TargetProcess->Flags & CsrProcessIsConsoleApp) ? TRUE : FALSE); // Testing TargetProcessData->HandleTableSize = 0; TargetProcessData->HandleTable = NULL; - /* HACK */ RtlZeroMemory(&TargetProcessData->HandleTableLock, sizeof(RTL_CRITICAL_SECTION)); + /**** HACK !!!! ****/ RtlZeroMemory(&TargetProcessData->HandleTableLock, sizeof(RTL_CRITICAL_SECTION)); RtlInitializeCriticalSection(&TargetProcessData->HandleTableLock); /* Do nothing if the source process is NULL */ @@ -267,51 +369,17 @@ if ( SourceProcessData->Console != NULL && /* SourceProcessData->ConsoleApp */ TargetProcessData->ConsoleApp ) { -/* - if (TargetProcessData->HandleTableSize) - { - return STATUS_INVALID_PARAMETER; - } -*/ - - DPRINT1("ConsoleNewProcess - Copy the handle table (1)\n"); + NTSTATUS Status; + + Status = Win32CsrInheritHandlesTable(SourceProcessData, TargetProcessData); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + // FIXME: Do it before, or after the handles table inheritance ?? /* Temporary "inherit" the console from the parent */ TargetProcessData->ParentConsole = SourceProcessData->Console; - RtlEnterCriticalSection(&SourceProcessData->HandleTableLock); - DPRINT1("ConsoleNewProcess - Copy the handle table (2)\n"); - - /* Allocate a new handle table for the child process */ - TargetProcessData->HandleTable = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - SourceProcessData->HandleTableSize - * sizeof(CONSOLE_IO_HANDLE)); - if (TargetProcessData->HandleTable == NULL) - { - RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); - return STATUS_UNSUCCESSFUL; - } - - TargetProcessData->HandleTableSize = SourceProcessData->HandleTableSize; - - /* - * Parse the parent process' handles table and, for each handle, - * do a copy of it and reference it, if the handle is inheritable. - */ - for (i = 0; i < SourceProcessData->HandleTableSize; i++) - { - if (SourceProcessData->HandleTable[i].Object != NULL && - SourceProcessData->HandleTable[i].Inheritable) - { - /* - * Copy the handle data and increment the reference count of the - * pointed object (via the call to Win32CsrCreateHandleEntry). - */ - TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; - Win32CsrCreateHandleEntry(&TargetProcessData->HandleTable[i]); - } - } - - RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); } else { @@ -335,7 +403,6 @@ PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); BOOLEAN NewConsole = FALSE; - // PCONSOLE Console = NULL; DPRINT1("ConsoleConnect\n"); @@ -354,13 +421,23 @@ return STATUS_SUCCESS; } - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - /* If we don't have a console, then create a new one... */ if (!ConnectInfo->Console || ConnectInfo->Console != ProcessData->ParentConsole) { DPRINT1("ConsoleConnect - Allocate a new console\n"); + + /* + * We are about to create a new console. However when ConsoleNewProcess + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handles table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the console we can have and our handles table, + * and recreate a new one later on. + */ + Win32CsrReleaseConsole(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ NewConsole = TRUE; @@ -368,7 +445,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Console initialization failed\n"); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } } @@ -381,41 +457,22 @@ ProcessData->Console = ConnectInfo->Console; } + /* Add a reference count because the process is tied to the console */ + _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + /* Insert the process into the processes list of the console */ InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); /* Return it to the caller */ ConnectInfo->Console = ProcessData->Console; - /* Add a reference count because the process is tied to the console */ - _InterlockedIncrement(&ProcessData->Console->ReferenceCount); - - if (NewConsole /* || !ProcessData->bInheritHandles */) - { - /* - * We've just created a new console. However when ConsoleNewProcess was - * called, we didn't know that we wanted to create a new console and - * therefore, we by default inherited the handles table from our parent - * process. It's only now that we notice that in fact we do not need - * them, because we've created a new console and thus we must use it. - * - * Therefore, free our handles table and recreate a new one. - */ - - ULONG i; - - /* Close all console handles and free the handle table memory */ - for (i = 0; i < ProcessData->HandleTableSize; i++) - { - Win32CsrCloseHandleEntry(&ProcessData->HandleTable[i]); - } - ProcessData->HandleTableSize = 0; - RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); - ProcessData->HandleTable = NULL; - + if (NewConsole) + { /* * Create a new handle table - Insert the IO handles */ + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); /* Insert the Input handle */ Status = Win32CsrInsertObject(ProcessData, @@ -427,9 +484,10 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the input handle\n"); - ConioDeleteConsole(ProcessData->Console); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } @@ -443,11 +501,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the output handle\n"); - ConioDeleteConsole(ProcessData->Console); - Win32CsrReleaseObject(ProcessData, - ConnectInfo->InputHandle); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->InputHandle); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } @@ -461,15 +520,18 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert the error handle\n"); - ConioDeleteConsole(ProcessData->Console); - Win32CsrReleaseObject(ProcessData, - ConnectInfo->OutputHandle); - Win32CsrReleaseObject(ProcessData, - ConnectInfo->InputHandle); - ProcessData->Console = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->OutputHandle); + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->InputHandle); + // ConioDeleteConsole(ProcessData->Console); + // ProcessData->Console = NULL; return Status; } + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); } /* Duplicate the Event */ @@ -481,18 +543,18 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtDuplicateObject() failed: %lu\n", Status); - ConioDeleteConsole(ProcessData->Console); - if (NewConsole /* || !ProcessData->bInheritHandles */) - { - Win32CsrReleaseObject(ProcessData, - ConnectInfo->ErrorHandle); - Win32CsrReleaseObject(ProcessData, - ConnectInfo->OutputHandle); - Win32CsrReleaseObject(ProcessData, - ConnectInfo->InputHandle); - } - ProcessData->Console = NULL; - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + Win32CsrReleaseConsole(ProcessData); + // if (NewConsole) + // { + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->ErrorHandle); + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->OutputHandle); + // Win32CsrReleaseObject(ProcessData, + // ConnectInfo->InputHandle); + // } + // ConioDeleteConsole(ProcessData->Console); // FIXME: Just release the console ? + // ProcessData->Console = NULL; return Status; } /* Input Wait Handle */ @@ -500,47 +562,9 @@ /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; - DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + DPRINT("CONSRV: CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); + return STATUS_SUCCESS; -} - -VOID -WINAPI -Win32CsrReleaseConsole(PCSR_PROCESS Process) -{ - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(Process); - PCONSOLE Console; - ULONG i; - - DPRINT1("Win32CsrReleaseConsole\n"); - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - /* Close all console handles and free the handle table memory */ - for (i = 0; i < ProcessData->HandleTableSize; i++) - { - Win32CsrCloseHandleEntry(&ProcessData->HandleTable[i]); - } - ProcessData->HandleTableSize = 0; - RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); - ProcessData->HandleTable = NULL; - - /* Detach process from console */ - Console = ProcessData->Console; - if (Console != NULL) - { - DPRINT1("Win32CsrReleaseConsole - Console->ReferenceCount = %lu - We are going to decrement it !\n", Console->ReferenceCount); - ProcessData->Console = NULL; - EnterCriticalSection(&Console->Lock); - RemoveEntryList(&ProcessData->ConsoleLink); - Win32CsrUnlockConsole(Console); - //CloseHandle(ProcessData->ConsoleEvent); - //ProcessData->ConsoleEvent = NULL; - } - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); } VOID @@ -551,19 +575,14 @@ /************************************************************************** * This function is called whenever a new process (GUI or CUI) is destroyed. - * - * Only do something if the process is a CUI. <-- modify this behaviour if - * we deal with a GUI which - * quits and acquired a - * console... **************************************************************************/ DPRINT1("ConsoleDisconnect called\n"); - // if (ProcessData->Console != NULL) - if (ProcessData->ConsoleApp) + if ( ProcessData->Console != NULL || + ProcessData->HandleTable != NULL ) { DPRINT1("ConsoleDisconnect - calling Win32CsrReleaseConsole\n"); - Win32CsrReleaseConsole(Process); + Win32CsrReleaseConsole(ProcessData); } RtlDeleteCriticalSection(&ProcessData->HandleTableLock); Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Sun Jan 13 17:07:25 2013 @@ -107,7 +107,7 @@ // SrvRegisterConsoleIME, // SrvUnregisterConsoleIME, // SrvGetConsoleLangId, - // SrvAttachConsole, + SrvAttachConsole, SrvGetConsoleSelectionInfo, SrvGetConsoleProcessList, SrvGetConsoleHistory, @@ -198,7 +198,7 @@ // FALSE, // SrvRegisterConsoleIME, // FALSE, // SrvUnregisterConsoleIME, // FALSE, // SrvGetConsoleLangId, - // FALSE, // SrvAttachConsole, + FALSE, // SrvAttachConsole, FALSE, // SrvGetConsoleSelectionInfo, FALSE, // SrvGetConsoleProcessList, FALSE, // SrvGetConsoleHistory, @@ -291,7 +291,7 @@ // "RegisterConsoleIME", // "UnregisterConsoleIME", // "GetConsoleLangId", - // "AttachConsole", + "AttachConsole", "GetConsoleSelectionInfo", "GetConsoleProcessList", "GetConsoleHistory",

1 0

[tkreuzer] 58165: [NDK] Revert accidental changes.
by tkreuzer＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: tkreuzer Date: Sun Jan 13 15:02:38 2013 New Revision: 58165 URL: http://svn.reactos.org/svn/reactos?rev=58165&view=rev Log: [NDK] Revert accidental changes. Modified: trunk/reactos/include/ndk/lgpl.txt trunk/reactos/include/ndk/ndk.txt trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/include/ndk/lgpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lgpl.txt?rev=5… ============================================================================== --- trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lgpl.txt [iso-8859-1] Sun Jan 13 15:02:38 2013 @@ -436,7 +436,7 @@ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED _In_ WRITING THE COPYRIGHT HOLDERS AND/OR +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -444,11 +444,11 @@ LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 16. _In_ NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING _Out_ OF THE USE OR INABILITY TO USE THE +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF @@ -499,4 +499,4 @@ <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice -That's all there is to it! +That's all there is to it! Modified: trunk/reactos/include/ndk/ndk.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ndk.txt?rev=58… ============================================================================== --- trunk/reactos/include/ndk/ndk.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ndk.txt [iso-8859-1] Sun Jan 13 15:02:38 2013 @@ -14,16 +14,16 @@ THIS SOFTWARE IS PROVIDED BY ALEX IONESCU ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. _In_ NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS +ARE DISCLAIMED. IN NO EVENT SHALL ALEX IONESCU OR THE NDK CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER _In_ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING _In_ ANY WAY _Out_ OF THE USE OF THIS SOFTWARE, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Alex Ionescu or -the NDK Project Contributors. +the NDK Project Contributors. Modified: trunk/reactos/include/ndk/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev… ============================================================================== --- trunk/reactos/include/ndk/readme.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/readme.txt [iso-8859-1] Sun Jan 13 15:02:38 2013 @@ -42,7 +42,7 @@ You MUST read GPL.TXT or LGPL.TXT after your decision. Violating your chosen license voids your usage rights of the NDK and will lead to legal action on the part of the author. Using this software with any later version of the GNU GPL or LGPL in no way -changes your obligations under the versions listed above. You MUST still release the +changes your obligations under the versions listed above. You MUST still release the NDK and its changes under the terms of the original licenses (either GPLv2 or LGPLv2.1) as listed above. This DOES NOT AFFECT the license of a software package released under a later version and ONLY serves to clarify that using the NDK with a later version is @@ -152,36 +152,36 @@ 3.1 ORGANIZATION - * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). - * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). + * The NDK is organized in a main folder (include/ndk) with arch-specific subfolders (ex: include/ndk/i386). + * The NDK is structured by NT Subsystem Component (ex: ex, ps, rtl, etc). * The NDK can either be included on-demand (#include <ndk/xxxxx.h>) or globally (#include <ndk/ntndk.h>). - The former is recommended to reduce compile time. + The former is recommended to reduce compile time. * The NDK is structured by function and type. Every Subsystem Component has an associated "xxfuncs.h" and - "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) + "xxtypes.h" header, where "xx" is the Subsystem (ex: iofuncs.h, iotypes.h) * The NDK has a special file called "umtypes.h" which exports to User-Mode or Native-Mode Applications the basic NT types which are present in ntdef.h. This file cannot be included since it would conflict with winnt.h and/or windef.h. Thus, umtypes.h provides the missing types. This file is automatically included - in a User-Mode NDK project. + in a User-Mode NDK project. * The NDK also includes a file called "umfuncs.h" which exports to User-Mode or Native-Mode Applications - undocumented functions which can only be accessed from ntdll.dll. + undocumented functions which can only be accessed from ntdll.dll. * The NDK has another special file called "ifssupp.h", which exports to Kernel-Mode drivers a few types which are only documented in the IFS kit, and are part of some native definitions. It will be deprecated next year - with the release of the WDK. - -3.2 USING _In_ YOUR PROJECT - - * User Mode Application requiring Native Types: + with the release of the WDK. + +3.2 USING IN YOUR PROJECT + + * User Mode Application requiring Native Types: #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ #include "windows.h" /* Declare Windows Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ - * Native Mode Application: + * Native Mode Application: #include "windows.h" /* Declare Windows Headers for basic types. NEEDED UNTIL NDK 1.5 */ #include "ntndk.h" /* Declare the NDK Headers */ - * Kernel Mode Driver: + * Kernel Mode Driver: #include "ntddk.h" /* Declare DDK Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */

1 0

[tkreuzer] 58164: [NDK] Add SAL 2 annotations, use dummy annotations, if no SAL is available [PSDK/DDK/XDK] Fix a number of annotations, change the order in wdm.h fix IRQL annotations
by tkreuzer＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: tkreuzer Date: Sun Jan 13 14:49:21 2013 New Revision: 58164 URL: http://svn.reactos.org/svn/reactos?rev=58164&view=rev Log: [NDK] Add SAL 2 annotations, use dummy annotations, if no SAL is available [PSDK/DDK/XDK] Fix a number of annotations, change the order in wdm.h fix IRQL annotations Added: trunk/reactos/include/ndk/no_sal2.h (with props) Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/dbgkfuncs.h trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/haltypes.h trunk/reactos/include/ndk/ifssupp.h trunk/reactos/include/ndk/inbvfuncs.h trunk/reactos/include/ndk/iofuncs.h trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/ndk/lgpl.txt trunk/reactos/include/ndk/lpcfuncs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/ndk.txt trunk/reactos/include/ndk/ntndk.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/obtypes.h trunk/reactos/include/ndk/pofuncs.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/readme.txt trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/ndk/sefuncs.h trunk/reactos/include/ndk/umfuncs.h trunk/reactos/include/ndk/vffuncs.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/kdfuncs.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/pstypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/wdm.template.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=58… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=58… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5816… Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… Modified: trunk/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgkfuncs.h?re… Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… Modified: trunk/reactos/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ifssupp.h?rev=… Modified: trunk/reactos/include/ndk/inbvfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inbvfuncs.h?re… Modified: trunk/reactos/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iofuncs.h?rev=… Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… Modified: trunk/reactos/include/ndk/lgpl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lgpl.txt?rev=5… Modified: trunk/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpcfuncs.h?rev… Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… Modified: trunk/reactos/include/ndk/ndk.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ndk.txt?rev=58… Added: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=… Modified: trunk/reactos/include/ndk/ntndk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ntndk.h?rev=58… Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=… Modified: trunk/reactos/include/ndk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pofuncs.h?rev=… Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… Modified: trunk/reactos/include/ndk/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev… Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… Modified: trunk/reactos/include/ndk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/sefuncs.h?rev=… Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… Modified: trunk/reactos/include/ndk/vffuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/vffuncs.h?rev=… Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=581… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… Modified: trunk/reactos/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=… Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… Modified: trunk/reactos/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pstypes.h?rev=… Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev… Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h…

1 0

[tfaber] 58163: [EXPLORER_NEW] - Process autostart registry entries. Patch by Edijs Kolesnikovičs. CORE-6887
by tfaber＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: tfaber Date: Sun Jan 13 10:38:47 2013 New Revision: 58163 URL: http://svn.reactos.org/svn/reactos?rev=58163&view=rev Log: [EXPLORER_NEW] - Process autostart registry entries. Patch by Edijs Kolesnikovičs. CORE-6887 Added: trunk/reactos/base/shell/explorer-new/startup.c - copied, changed from r58156, trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Jan 13 10:38:47 2013 @@ -7,6 +7,7 @@ explorer.c settings.c startmnu.c + startup.c taskband.c taskswnd.c tbsite.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Sun Jan 13 10:38:47 2013 @@ -400,6 +400,8 @@ /* WinXP: Notify msgina to hide the welcome screen */ if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + + startup(0, NULL); } else { Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sun Jan 13 10:38:47 2013 @@ -257,6 +257,12 @@ IN DWORD dwValue); /* + * startup.c + */ + +int startup(int argc, const char *argv[]); + +/* * trayprop.h */ Copied: trunk/reactos/base/shell/explorer-new/startup.c (from r58156, trunk/reactos/base/shell/explorer/services/startup.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startup.c [iso-8859-1] Sun Jan 13 10:38:47 2013 @@ -1,6 +1,7 @@ /* * Copyright (C) 2002 Andreas Mohr * Copyright (C) 2002 Shachar Shemesh + * Copyright (C) 2013 Edijs Kolesnikovics * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,10 +25,6 @@ * Knowledge base articles that explain this are 137367, 179365, 232487 and 232509. * Also, 119941 has some info on grpconv.exe * The operations performed are (by order of execution): - * - * Preboot (prior to fully loading the Windows kernel): - * - wininit.exe (rename operations left in wininit.ini - Win 9x only) - * - PendingRenameOperations (rename operations left in the registry - Win NT+ only) * * Startup (before the user logs in) * - Services (NT, ?semi-synchronous?, not implemented yet) @@ -42,176 +39,11 @@ * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce (all, asynch) * * Somewhere in there is processing the RunOnceEx entries (also no imp) - * - * Bugs: - * - If a pending rename registry does not start with \??\ the entry is - * processed anyways. I'm not sure that is the Windows behaviour. - * - Need to check what is the windows behaviour when trying to delete files - * and directories that are read-only - * - In the pending rename registry processing - there are no traces of the files - * processed (requires translations from Unicode to Ansi). */ -#include <stdio.h> -#include <windows.h> -#include <ctype.h> +#include "precomp.h" EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); - -/** - * Performs the rename operations dictated in %SystemRoot%\Wininit.ini. - * Returns FALSE if there was an error, or otherwise if all is ok. - */ -static BOOL wininit() -{ - return TRUE; -} - -static BOOL pendingRename() -{ - static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', - 'F','i','l','e','R','e','n','a','m','e', - 'O','p','e','r','a','t','i','o','n','s',0}; - static const WCHAR SessionW[] = { 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; - WCHAR *buffer=NULL; - const WCHAR *src=NULL, *dst=NULL; - DWORD dataLength=0; - HKEY hSession=NULL; - DWORD res; - - printf("Entered\n"); - - if ((res=RegOpenKeyExW(HKEY_LOCAL_MACHINE, SessionW, 0, KEY_ALL_ACCESS, &hSession)) - !=ERROR_SUCCESS) - { - if (res==ERROR_FILE_NOT_FOUND) - { - printf("The key was not found - skipping\n"); - res=TRUE; - } - else - { - printf("Couldn't open key, error %ld\n", res); - res=FALSE; - } - - goto end; - } - - res=RegQueryValueExW(hSession, ValueName, NULL, NULL /* The value type does not really interest us, as it is not - truely a REG_MULTI_SZ anyways */, - NULL, &dataLength); - if (res==ERROR_FILE_NOT_FOUND) - { - /* No value - nothing to do. Great! */ - printf("Value not present - nothing to rename\n"); - res=TRUE; - goto end; - } - - if (res!=ERROR_SUCCESS) - { - printf("Couldn't query value's length (%ld)\n", res); - res=FALSE; - goto end; - } - - buffer=malloc(dataLength); - if (buffer==NULL) - { - printf("Couldn't allocate %lu bytes for the value\n", dataLength); - res=FALSE; - goto end; - } - - res=RegQueryValueExW(hSession, ValueName, NULL, NULL, (LPBYTE)buffer, &dataLength); - if (res!=ERROR_SUCCESS) - { - printf("Couldn't query value after successfully querying before (%lu),\n" - "please report to wine-devel(a)winehq.org\n", res); - res=FALSE; - goto end; - } - - /* Make sure that the data is long enough and ends with two NULLs. This - * simplifies the code later on. - */ - if (dataLength<2*sizeof(buffer[0]) || - buffer[dataLength/sizeof(buffer[0])-1]!='\0' || - buffer[dataLength/sizeof(buffer[0])-2]!='\0') - { - printf("Improper value format - doesn't end with NULL\n"); - res=FALSE; - goto end; - } - - for(src=buffer; (src-buffer)*sizeof(src[0])<dataLength && *src!='\0'; - src=dst+lstrlenW(dst)+1) - { - DWORD dwFlags=0; - - printf("processing next command\n"); - - dst=src+lstrlenW(src)+1; - - /* We need to skip the \??\ header */ - if (src[0]=='\\' && src[1]=='?' && src[2]=='?' && src[3]=='\\') - src+=4; - - if (dst[0]=='!') - { - dwFlags|=MOVEFILE_REPLACE_EXISTING; - dst++; - } - - if (dst[0]=='\\' && dst[1]=='?' && dst[2]=='?' && dst[3]=='\\') - dst+=4; - - if (*dst!='\0') - { - /* Rename the file */ - MoveFileExW(src, dst, dwFlags); - } else - { - /* Delete the file or directory */ - res = GetFileAttributesW (src); - if (res != (DWORD)-1) - { - if ((res&FILE_ATTRIBUTE_DIRECTORY)==0) - { - /* It's a file */ - DeleteFileW(src); - } else - { - /* It's a directory */ - RemoveDirectoryW(src); - } - } else - { - printf("couldn't get file attributes (%ld)\n", GetLastError()); - } - } - } - - if ((res=RegDeleteValueW(hSession, ValueName))!=ERROR_SUCCESS) - { - printf("Error deleting the value (%lu)\n", GetLastError()); - res=FALSE; - } else - res=TRUE; - -end: - if (buffer!=NULL) - free(buffer); - - if (hSession!=NULL) - RegCloseKey(hSession); - - return res; -} enum runkeys { RUNKEY_RUN, RUNKEY_RUNONCE, RUNKEY_RUNSERVICES, RUNKEY_RUNSERVICESONCE @@ -242,17 +74,17 @@ { STARTUPINFOW si; PROCESS_INFORMATION info; - DWORD exit_code=0; - WCHAR szCmdLineExp[MAX_PATH+1]= L"\0"; + DWORD exit_code = 0; + WCHAR szCmdLineExp[MAX_PATH+1] = L"\0"; ExpandEnvironmentStringsW(cmdline, szCmdLineExp, sizeof(szCmdLineExp) / sizeof(WCHAR)); memset(&si, 0, sizeof(si)); - si.cb=sizeof(si); + si.cb = sizeof(si); if (minimized) { - si.dwFlags=STARTF_USESHOWWINDOW; - si.wShowWindow=SW_MINIMIZE; + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_MINIMIZE; } memset(&info, 0, sizeof(info)); @@ -263,8 +95,7 @@ return INVALID_RUNCMD_RETURN; } - printf("Successfully ran command\n"); //%s - Created process handle %p\n", - //wine_dbgstr_w(szCmdLineExp), info.hProcess); + printf("Successfully ran command\n"); if (wait) { /* wait for the process to exit */ @@ -277,6 +108,7 @@ return exit_code; } + /** * Process a "Run" type registry key. @@ -293,18 +125,18 @@ static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; - HKEY hkWin=NULL, hkRun=NULL; - LONG res=ERROR_SUCCESS; - DWORD i, nMaxCmdLine=0, nMaxValue=0; - WCHAR *szCmdLine=NULL; - WCHAR *szValue=NULL; - - if (hkRoot==HKEY_LOCAL_MACHINE) + HKEY hkWin = NULL, hkRun=NULL; + LONG res = ERROR_SUCCESS; + DWORD i, nMaxCmdLine = 0, nMaxValue = 0; + WCHAR *szCmdLine = NULL; + WCHAR *szValue = NULL; + + if (hkRoot == HKEY_LOCAL_MACHINE) wprintf(L"processing %s entries under HKLM\n", szKeyName); else wprintf(L"processing %s entries under HKCU\n", szKeyName); - if ((res=RegOpenKeyExW(hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin))!=ERROR_SUCCESS) + if ((res = RegOpenKeyExW(hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin)) != ERROR_SUCCESS) { printf("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res); @@ -312,14 +144,14 @@ goto end; } - if ((res=RegOpenKeyExW(hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun))!= + if ((res = RegOpenKeyExW(hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun))!= ERROR_SUCCESS) { - if (res==ERROR_FILE_NOT_FOUND) + if (res == ERROR_FILE_NOT_FOUND) { printf("Key doesn't exist - nothing to be done\n"); - res=ERROR_SUCCESS; + res = ERROR_SUCCESS; } else printf("RegOpenKey failed on run key (%ld)\n", res); @@ -327,48 +159,48 @@ goto end; } - if ((res=RegQueryInfoKeyW(hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, - &nMaxCmdLine, NULL, NULL))!=ERROR_SUCCESS) + if ((res = RegQueryInfoKeyW(hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, + &nMaxCmdLine, NULL, NULL)) != ERROR_SUCCESS) { printf("Couldn't query key info (%ld)\n", res); goto end; } - if (i==0) + if (i == 0) { printf("No commands to execute.\n"); - res=ERROR_SUCCESS; - goto end; - } - - if ((szCmdLine=malloc(nMaxCmdLine))==NULL) + res = ERROR_SUCCESS; + goto end; + } + + if ((szCmdLine = malloc(nMaxCmdLine)) == NULL) { printf("Couldn't allocate memory for the commands to be executed\n"); - res=ERROR_NOT_ENOUGH_MEMORY; - goto end; - } - - if ((szValue=malloc((++nMaxValue)*sizeof(*szValue)))==NULL) + res = ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + if ((szValue = malloc((++nMaxValue)*sizeof(*szValue))) == NULL) { printf("Couldn't allocate memory for the value names\n"); free(szCmdLine); - res=ERROR_NOT_ENOUGH_MEMORY; - goto end; - } - - while(i>0) + res = ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + while(i > 0) { DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; DWORD type; --i; - if ((res=RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type, - (LPBYTE)szCmdLine, &nDataLength))!=ERROR_SUCCESS) + if ((res = RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type, + (LPBYTE)szCmdLine, &nDataLength)) != ERROR_SUCCESS) { printf("Couldn't read in value %ld - %ld\n", i, res); @@ -378,19 +210,19 @@ /* safe mode - force to run if prefixed with asterisk */ if (GetSystemMetrics(SM_CLEANBOOT) && (szValue[0] != L'*')) continue; - if (bDelete && (res=RegDeleteValueW(hkRun, szValue))!=ERROR_SUCCESS) + if (bDelete && (res = RegDeleteValueW(hkRun, szValue)) != ERROR_SUCCESS) { printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res); } - if (type!=REG_SZ) + if (type != REG_SZ) { printf("Incorrect type of value #%ld (%ld)\n", i, type); continue; } - if ((res=runCmd(szCmdLine, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) + if ((res = runCmd(szCmdLine, NULL, bSynchronous, FALSE)) == INVALID_RUNCMD_RETURN) { printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); } @@ -400,17 +232,17 @@ free(szValue); free(szCmdLine); - res=ERROR_SUCCESS; + res = ERROR_SUCCESS; end: - if (hkRun!=NULL) + if (hkRun != NULL) RegCloseKey(hkRun); - if (hkWin!=NULL) + if (hkWin != NULL) RegCloseKey(hkWin); printf("done\n"); - return res==ERROR_SUCCESS?TRUE:FALSE; + return res == ERROR_SUCCESS ? TRUE : FALSE; } /// structure holding startup flags @@ -424,8 +256,8 @@ }; static const struct op_mask - SESSION_START = {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE}, - SETUP = {FALSE, FALSE, FALSE, TRUE, TRUE, TRUE}; + SESSION_START = {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE}, + SETUP = {FALSE, FALSE, FALSE, TRUE, TRUE, TRUE}; #define DEFAULT SESSION_START int startup(int argc, const char *argv[]) @@ -439,12 +271,12 @@ res = GetWindowsDirectory(gen_path, sizeof(gen_path)); - if (res==0) - { - printf("Couldn't get the windows directory - error %ld\n", - GetLastError()); - - return 100; + if (res == 0) + { + printf("Couldn't get the windows directory - error %ld\n", + GetLastError()); + + return 100; } if (!SetCurrentDirectory(gen_path)) @@ -487,31 +319,27 @@ ops = DEFAULT; break; } - } else + } + else ops = DEFAULT; /* do not run certain items in Safe Mode */ - if(GetSystemMetrics(SM_CLEANBOOT)) ops.startup = FALSE; + if (GetSystemMetrics(SM_CLEANBOOT)) ops.startup = FALSE; /* Perform the ops by order, stopping if one fails, skipping if necessary */ - /* Shachar: Sorry for the perl syntax */ res = TRUE; - if (res && !ops.ntonly && ops.preboot) - res = wininit(); - if (res && !ops.w9xonly && ops.preboot) - res = pendingRename(); if (res && !ops.ntonly && ops.prelogin) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE); + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE); if (res && !ops.ntonly && ops.prelogin && ops.startup) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE); + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE); if (res && ops.postlogin) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE); + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE); if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); if (res && ops.postlogin && ops.startup) - res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE, FALSE); + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUNONCE], TRUE, FALSE); printf("Operation done\n");

1 0

[ekohl] 58162: [SAMSRV] Implement SamrGetGroupsForUser.
by ekohl＠svn.reactos.org 13 Jan '13

13 Jan '13

Author: ekohl Date: Sun Jan 13 10:19:56 2013 New Revision: 58162 URL: http://svn.reactos.org/svn/reactos?rev=58162&view=rev Log: [SAMSRV] Implement SamrGetGroupsForUser. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jan 13 10:19:56 2013 @@ -6562,15 +6562,100 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 39 */ NTSTATUS NTAPI SamrGetGroupsForUser(IN SAMPR_HANDLE UserHandle, OUT PSAMPR_GET_GROUPS_BUFFER *Groups) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAMPR_GET_GROUPS_BUFFER GroupsBuffer = NULL; + PSAM_DB_OBJECT UserObject; + ULONG Length = 0; + NTSTATUS Status; + + TRACE("SamrGetGroupsForUser(%p %p)\n", + UserHandle, Groups); + + /* Validate the domain handle */ + Status = SampValidateDbObject(UserHandle, + SamDbUserObject, + USER_LIST_GROUPS, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + /* Allocate the groups buffer */ + GroupsBuffer = midl_user_allocate(sizeof(SAMPR_GET_GROUPS_BUFFER)); + if (GroupsBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* + * Get the size of the Groups attribute. + * Do not check the status code because in case of an error + * Length will be 0. And that is all we need. + */ + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + /* If there is no Groups attribute, return a groups buffer without an array */ + if (Length == 0) + { + GroupsBuffer->MembershipCount = 0; + GroupsBuffer->Groups = NULL; + + *Groups = GroupsBuffer; + + return STATUS_SUCCESS; + } + + /* Allocate a buffer for the Groups attribute */ + GroupsBuffer->Groups = midl_user_allocate(Length); + if (GroupsBuffer->Groups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Retrieve the Grous attribute */ + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer->Groups, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed with status 0x%08lx\n", Status); + goto done; + } + + /* Calculate the membership count */ + GroupsBuffer->MembershipCount = Length / sizeof(GROUP_MEMBERSHIP); + + /* Return the groups buffer to the caller */ + *Groups = GroupsBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (GroupsBuffer != NULL) + { + if (GroupsBuffer->Groups != NULL) + midl_user_free(GroupsBuffer->Groups); + + midl_user_free(GroupsBuffer); + } + } + + return Status; +} + /* Function 40 */ NTSTATUS @@ -6772,10 +6857,10 @@ /* Store the fixed domain attributes */ Status = SampSetObjectAttribute(DomainObject, - L"F", - REG_BINARY, - &FixedDomainData, - ulSize); + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status);

1 0

[ekohl] 58161: [SAMSRV] - SamrAddMemberToGroup: Add the group membership to the user object. - SamrRemoveMemberFromGroup: Remove the group membership from the user object.
by ekohl＠svn.reactos.org 12 Jan '13

12 Jan '13

Author: ekohl Date: Sat Jan 12 21:32:26 2013 New Revision: 58161 URL: http://svn.reactos.org/svn/reactos?rev=58161&view=rev Log: [SAMSRV] - SamrAddMemberToGroup: Add the group membership to the user object. - SamrRemoveMemberFromGroup: Remove the group membership from the user object. Added: trunk/reactos/dll/win32/samsrv/user.c (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sat Jan 12 21:32:26 2013 @@ -15,6 +15,7 @@ samrpc.c samsrv.c setup.c + user.c samsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 12 21:32:26 2013 @@ -3931,6 +3931,7 @@ IN unsigned long Attributes) { PSAM_DB_OBJECT GroupObject; + PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; TRACE("(%p %lu %lx)\n", @@ -3944,10 +3945,38 @@ if (!NT_SUCCESS(Status)) return Status; - /* FIXME: Add group membership to the user object */ - + /* Open the user object in the same domain */ + Status = SampOpenUserObject(GroupObject->ParentObject, + MemberId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + ERR("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Add group membership to the user object */ + Status = SampAddGroupMembershipToUser(UserObject, + GroupObject->RelativeId, + Attributes); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Add the member to the group object */ Status = SampAddMemberToGroup(GroupObject, MemberId); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddMemberToGroup() failed (Status 0x%08lx)\n", Status); + } + +done: + if (UserObject) + SampCloseDbObject(UserObject); return Status; } @@ -3970,6 +3999,7 @@ IN unsigned long MemberId) { PSAM_DB_OBJECT GroupObject; + PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; TRACE("(%p %lu)\n", @@ -3983,10 +4013,37 @@ if (!NT_SUCCESS(Status)) return Status; - /* FIXME: Remove group membership from the user object */ - + /* Open the user object in the same domain */ + Status = SampOpenUserObject(GroupObject->ParentObject, + MemberId, + 0, + &UserObject); + if (!NT_SUCCESS(Status)) + { + ERR("SampOpenUserObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove group membership from the user object */ + Status = SampRemoveGroupMembershipFromUser(UserObject, + GroupObject->RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SampAddGroupMembershipToUser() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove the member from the group object */ Status = SampRemoveMemberFromGroup(GroupObject, MemberId); + if (!NT_SUCCESS(Status)) + { + ERR("SampRemoveMemberFromGroup() failed (Status 0x%08lx)\n", Status); + } + +done: + if (UserObject) + SampCloseDbObject(UserObject); return Status; } Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Jan 12 21:32:26 2013 @@ -261,4 +261,22 @@ BOOL SampIsSetupRunning(VOID); BOOL SampInitializeSAM(VOID); + +/* user.c */ + +NTSTATUS +SampOpenUserObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *UserObject); + +NTSTATUS +SampAddGroupMembershipToUser(PSAM_DB_OBJECT UserObject, + ULONG GroupId, + ULONG Attributes); + +NTSTATUS +SampRemoveGroupMembershipFromUser(PSAM_DB_OBJECT UserObject, + ULONG GroupId); + /* EOF */ Added: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c (added) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Sat Jan 12 21:32:26 2013 @@ -1,0 +1,188 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/user.c + * PURPOSE: User specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenUserObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG UserId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *UserObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, UserId, DesiredAccess, UserObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", UserId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Users", + szRid, + UserId, + SamDbUserObject, + DesiredAccess, + UserObject); +} + + +NTSTATUS +SampAddGroupMembershipToUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId, + IN ULONG Attributes) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG GroupsCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + TRACE("(%p %lu %lx)\n", + UserObject, GroupId, Attributes); + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + GroupsBuffer = midl_user_allocate(Length + sizeof(GROUP_MEMBERSHIP)); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + GroupsCount = Length / sizeof(GROUP_MEMBERSHIP); + } + + for (i = 0; i < GroupsCount; i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + Status = STATUS_MEMBER_IN_GROUP; + goto done; + } + } + + GroupsBuffer[GroupsCount].RelativeId = GroupId; + GroupsBuffer[GroupsCount].Attributes = Attributes; + Length += sizeof(GROUP_MEMBERSHIP); + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + GroupsBuffer, + Length); + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + + +NTSTATUS +SampRemoveGroupMembershipFromUser(IN PSAM_DB_OBJECT UserObject, + IN ULONG GroupId) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + ULONG GroupsCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + TRACE("(%p %lu)\n", + UserObject, GroupId); + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_MEMBER_NOT_IN_GROUP; + + if (!NT_SUCCESS(Status)) + return Status; + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Status = STATUS_MEMBER_NOT_IN_GROUP; + + GroupsCount = Length / sizeof(GROUP_MEMBERSHIP); + for (i = 0; i < GroupsCount; i++) + { + if (GroupsBuffer[i].RelativeId == GroupId) + { + Length -= sizeof(GROUP_MEMBERSHIP); + Status = STATUS_SUCCESS; + break; + } + + if (Status == STATUS_SUCCESS && i < GroupsCount - 1) + { + CopyMemory(&GroupsBuffer[i], + &GroupsBuffer[i + 1], + sizeof(GROUP_MEMBERSHIP)); + } + } + + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + GroupsBuffer, + Length); + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/user.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/user.c ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[ekohl] 58160: [SAMSRV] - Move domain specific helper functions to a separate file. - Implement SampRemoveAccountNameFromDomain.
by ekohl＠svn.reactos.org 12 Jan '13

12 Jan '13

Author: ekohl Date: Sat Jan 12 16:22:46 2013 New Revision: 58160 URL: http://svn.reactos.org/svn/reactos?rev=58160&view=rev Log: [SAMSRV] - Move domain specific helper functions to a separate file. - Implement SampRemoveAccountNameFromDomain. Added: trunk/reactos/dll/win32/samsrv/domain.c (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sat Jan 12 16:22:46 2013 @@ -9,6 +9,7 @@ list(APPEND SOURCE database.c + domain.c group.c registry.c samrpc.c Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sat Jan 12 16:22:46 2013 @@ -488,190 +488,6 @@ NTSTATUS -SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAccountName, - IN ULONG ulRelativeId) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE ContainerKeyHandle = NULL; - HANDLE NamesKeyHandle = NULL; - NTSTATUS Status; - - TRACE("SampSetAccountNameInDomain()\n"); - - /* Open the container key */ - RtlInitUnicodeString(&KeyName, lpContainerName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DomainObject->KeyHandle, - NULL); - - Status = NtOpenKey(&ContainerKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - /* Open the 'Names' key */ - RtlInitUnicodeString(&KeyName, L"Names"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ContainerKeyHandle, - NULL); - - Status = NtOpenKey(&NamesKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - goto done; - - /* Set the alias value */ - RtlInitUnicodeString(&ValueName, lpAccountName); - - Status = NtSetValueKey(NamesKeyHandle, - &ValueName, - 0, - REG_DWORD, - (LPVOID)&ulRelativeId, - sizeof(ULONG)); - -done: - if (NamesKeyHandle) - NtClose(NamesKeyHandle); - - if (ContainerKeyHandle) - NtClose(ContainerKeyHandle); - - return Status; -} - - -NTSTATUS -SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpAccountName) -{ - HANDLE AccountKey; - HANDLE NamesKey; - NTSTATUS Status; - - TRACE("SampCheckAccountNameInDomain()\n"); - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Aliases", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for alias account failed (Status 0x%08lx)\n", Status); - return Status; - } - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Groups", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for group account failed (Status 0x%08lx)\n", Status); - return Status; - } - - Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Users", - KEY_READ, - &AccountKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegOpenKey(AccountKey, - L"Names", - KEY_READ, - &NamesKey); - if (NT_SUCCESS(Status)) - { - Status = SampRegQueryValue(NamesKey, - lpAccountName, - NULL, - NULL, - NULL); - if (Status == STATUS_SUCCESS) - { - SampRegCloseKey(NamesKey); - Status = STATUS_ALIAS_EXISTS; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - Status = STATUS_SUCCESS; - } - - SampRegCloseKey(AccountKey); - } - - if (!NT_SUCCESS(Status)) - { - TRACE("Checking for user account failed (Status 0x%08lx)\n", Status); - } - - return Status; -} - - -NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, Added: trunk/reactos/dll/win32/samsrv/domain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/domain.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/domain.c (added) +++ trunk/reactos/dll/win32/samsrv/domain.c [iso-8859-1] Sat Jan 12 16:22:46 2013 @@ -1,0 +1,259 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/domain.c + * PURPOSE: Domain specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + TRACE("SampSetAccountNameInDomain()\n"); + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the alias value */ + RtlInitUnicodeString(&ValueName, lpAccountName); + + Status = NtSetValueKey(NamesKeyHandle, + &ValueName, + 0, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampRemoveAccountNameFromDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ContainerKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + NTSTATUS Status; + + TRACE("(%S %S)\n", lpContainerName, lpAccountName); + + /* Open the container key */ + RtlInitUnicodeString(&KeyName, lpContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DomainObject->KeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + /* Open the 'Names' key */ + RtlInitUnicodeString(&KeyName, L"Names"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&NamesKeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto done; + + /* Delete the account name value */ + Status = SampRegDeleteValue(NamesKeyHandle, + lpAccountName); + +done: + if (NamesKeyHandle) + NtClose(NamesKeyHandle); + + if (ContainerKeyHandle) + NtClose(ContainerKeyHandle); + + return Status; +} + + +NTSTATUS +SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpAccountName) +{ + HANDLE AccountKey; + HANDLE NamesKey; + NTSTATUS Status; + + TRACE("SampCheckAccountNameInDomain()\n"); + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for alias account failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for group account failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Users", + KEY_READ, + &AccountKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountKey, + L"Names", + KEY_READ, + &NamesKey); + if (NT_SUCCESS(Status)) + { + Status = SampRegQueryValue(NamesKey, + lpAccountName, + NULL, + NULL, + NULL); + if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); + Status = STATUS_ALIAS_EXISTS; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + } + + SampRegCloseKey(AccountKey); + } + + if (!NT_SUCCESS(Status)) + { + TRACE("Checking for user account failed (Status 0x%08lx)\n", Status); + } + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/domain.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/domain.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Jan 12 16:22:46 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Security Account Manager (SAM) Server + * PROJECT: Security Account Manager (LSA) Server * FILE: reactos/dll/win32/samsrv/samsrv.h * PURPOSE: Common header file * @@ -143,16 +143,6 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject); NTSTATUS -SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpAccountName); - -NTSTATUS -SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAccountName, - IN ULONG ulRelativeId); - -NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, ULONG AttributeType, @@ -170,6 +160,24 @@ SampGetObjectAttributeString(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, RPC_UNICODE_STRING *String); + + +/* domain.c */ + +NTSTATUS +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId); + +NTSTATUS +SampRemoveAccountNameFromDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName); + +NTSTATUS +SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpAccountName); /* group.h */

1 0

[ekohl] 58159: [SAMSRV] - Implement SamrAddMemberToGroup and SamrRemoveMemberFromGroup partially. - Constify some parameters.
by ekohl＠svn.reactos.org 12 Jan '13

12 Jan '13

Author: ekohl Date: Sat Jan 12 15:30:28 2013 New Revision: 58159 URL: http://svn.reactos.org/svn/reactos?rev=58159&view=rev Log: [SAMSRV] - Implement SamrAddMemberToGroup and SamrRemoveMemberFromGroup partially. - Constify some parameters. Added: trunk/reactos/dll/win32/samsrv/group.c (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -9,6 +9,7 @@ list(APPEND SOURCE database.c + group.c registry.c samrpc.c samsrv.c Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -555,7 +555,7 @@ NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPWSTR lpAccountName) + IN LPCWSTR lpAccountName) { HANDLE AccountKey; HANDLE NamesKey; Added: trunk/reactos/dll/win32/samsrv/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/group.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/group.c (added) +++ trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -1,0 +1,154 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/group.c + * PURPOSE: Group specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + + +NTSTATUS +SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId) +{ + PULONG MembersBuffer = NULL; + ULONG MembersCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + MembersBuffer = midl_user_allocate(Length + sizeof(ULONG)); + if (MembersBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + MembersBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + MembersCount = Length / sizeof(ULONG); + } + + for (i = 0; i < MembersCount; i++) + { + if (MembersBuffer[i] == MemberId) + { + Status = STATUS_MEMBER_IN_GROUP; + goto done; + } + } + + MembersBuffer[MembersCount] = MemberId; + Length += sizeof(ULONG); + + Status = SampSetObjectAttribute(GroupObject, + L"Members", + REG_BINARY, + MembersBuffer, + Length); + +done: + if (MembersBuffer != NULL) + midl_user_free(MembersBuffer); + + return Status; +} + + +NTSTATUS +SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId) +{ + PULONG MembersBuffer = NULL; + ULONG MembersCount = 0; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &Length); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + return STATUS_MEMBER_NOT_IN_GROUP; + + if (!NT_SUCCESS(Status)) + return Status; + + MembersBuffer = midl_user_allocate(Length); + if (MembersBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + MembersBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + Status = STATUS_MEMBER_NOT_IN_GROUP; + + MembersCount = Length / sizeof(ULONG); + for (i = 0; i < MembersCount; i++) + { + if (MembersBuffer[i] == MemberId) + { + Length -= sizeof(ULONG); + Status = STATUS_SUCCESS; + break; + } + + if (Status == STATUS_SUCCESS && i < MembersCount - 1) + { + MembersBuffer[i] = MembersBuffer[i + 1]; + } + } + + if (!NT_SUCCESS(Status)) + goto done; + + Status = SampSetObjectAttribute(GroupObject, + L"Members", + REG_BINARY, + MembersBuffer, + Length); + +done: + if (MembersBuffer != NULL) + midl_user_free(MembersBuffer); + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/group.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/group.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -202,7 +202,7 @@ NTSTATUS SampRegDeleteValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName) + IN LPCWSTR ValueName) { UNICODE_STRING Name; @@ -322,7 +322,7 @@ NTSTATUS SampRegQueryValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, OUT PULONG Type OPTIONAL, OUT PVOID Data OPTIONAL, IN OUT PULONG DataLength OPTIONAL) @@ -392,7 +392,7 @@ NTSTATUS SampRegSetValue(HANDLE KeyHandle, - LPWSTR ValueName, + LPCWSTR ValueName, ULONG Type, LPVOID Data, ULONG DataLength) Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -191,7 +191,7 @@ NTAPI SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, IN SECURITY_INFORMATION SecurityInformation, - OUT PSAMPR_SR_SECURITY_DESCRIPTOR * SecurityDescriptor) + OUT PSAMPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3593,8 +3593,8 @@ PSAMPR_GROUP_INFO_BUFFER *Buffer) { PSAMPR_GROUP_INFO_BUFFER InfoBuffer = NULL; - HANDLE MembersKeyHandle = NULL; SAM_GROUP_FIXED_DATA FixedData; + ULONG MembersLength = 0; ULONG Length = 0; NTSTATUS Status; @@ -3633,33 +3633,22 @@ InfoBuffer->General.Attributes = FixedData.Attributes; - /* Open the Members subkey */ - Status = SampRegOpenKey(GroupObject->KeyHandle, - L"Members", - KEY_READ, - &MembersKeyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("Status 0x%08lx\n", Status); - goto done; - } - - /* Retrieve the number of members of the alias */ - Status = SampRegQueryKeyInfo(MembersKeyHandle, - NULL, - &InfoBuffer->General.MemberCount); - if (!NT_SUCCESS(Status)) - { - TRACE("Status 0x%08lx\n", Status); - goto done; - } + Status = SampGetObjectAttribute(GroupObject, + L"Members", + NULL, + NULL, + &MembersLength); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + InfoBuffer->General.MemberCount = 0; + else + InfoBuffer->General.MemberCount = MembersLength / sizeof(ULONG); *Buffer = InfoBuffer; done: - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - if (!NT_SUCCESS(Status)) { if (InfoBuffer != NULL) @@ -3941,18 +3930,38 @@ IN unsigned long MemberId, IN unsigned long Attributes) { + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("(%p %lu %lx)\n", + GroupHandle, MemberId, Attributes); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_ADD_MEMBER, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* FIXME: Add group membership to the user object */ + + Status = SampAddMemberToGroup(GroupObject, + MemberId); + + return Status; +} + + +/* Function 21 */ +NTSTATUS +NTAPI +SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -/* Function 21 */ -NTSTATUS -NTAPI -SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} /* Function 24 */ NTSTATUS @@ -3960,9 +3969,28 @@ SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, IN unsigned long MemberId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT GroupObject; + NTSTATUS Status; + + TRACE("(%p %lu)\n", + GroupHandle, MemberId); + + /* Validate the group handle */ + Status = SampValidateDbObject(GroupHandle, + SamDbGroupObject, + GROUP_REMOVE_MEMBER, + &GroupObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* FIXME: Remove group membership from the user object */ + + Status = SampRemoveMemberFromGroup(GroupObject, + MemberId); + + return Status; +} + /* Function 25 */ NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Jan 12 15:30:28 2013 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Security Account Manager (LSA) Server + * PROJECT: Security Account Manager (SAM) Server * FILE: reactos/dll/win32/samsrv/samsrv.h * PURPOSE: Common header file * @@ -109,6 +109,7 @@ USHORT OperatorCount; } SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA; + /* database.c */ NTSTATUS @@ -143,7 +144,7 @@ NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, - IN LPWSTR lpAccountName); + IN LPCWSTR lpAccountName); NTSTATUS SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, @@ -170,7 +171,20 @@ LPWSTR AttributeName, RPC_UNICODE_STRING *String); + +/* group.h */ + +NTSTATUS +SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId); + +NTSTATUS +SampRemoveMemberFromGroup(IN PSAM_DB_OBJECT GroupObject, + IN ULONG MemberId); + + /* registry.h */ + NTSTATUS SampRegCloseKey(IN HANDLE KeyHandle); @@ -203,7 +217,7 @@ NTSTATUS SampRegDeleteValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName); + IN LPCWSTR ValueName); NTSTATUS SampRegEnumerateValue(IN HANDLE KeyHandle, @@ -216,21 +230,27 @@ NTSTATUS SampRegQueryValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, OUT PULONG Type OPTIONAL, OUT LPVOID Data OPTIONAL, IN OUT PULONG DataLength OPTIONAL); NTSTATUS SampRegSetValue(IN HANDLE KeyHandle, - IN LPWSTR ValueName, + IN LPCWSTR ValueName, IN ULONG Type, IN LPVOID Data, IN ULONG DataLength); + /* samspc.c */ + VOID SampStartRpcServer(VOID); + /* setup.c */ + BOOL SampIsSetupRunning(VOID); -BOOL SampInitializeSAM(VOID); +BOOL SampInitializeSAM(VOID); + +/* EOF */

1 0

[hbelusca] 58158: [CSRSRV] Initialize an uninitialized variable.
by hbelusca＠svn.reactos.org 12 Jan '13

12 Jan '13

Author: hbelusca Date: Sat Jan 12 00:33:55 2013 New Revision: 58158 URL: http://svn.reactos.org/svn/reactos?rev=58158&view=rev Log: [CSRSRV] Initialize an uninitialized variable. Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sat Jan 12 00:33:55 2013 @@ -1079,7 +1079,7 @@ { PLIST_ENTRY NextEntry; PCSR_PROCESS CurrentProcess = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Acquire the lock */ CsrAcquireProcessLock();

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