Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57687: [CONSRV] Code formatting only.
by hbelusca＠svn.reactos.org 07 Nov '12

07 Nov '12

Author: hbelusca Date: Wed Nov 7 21:16:09 2012 New Revision: 57687 URL: http://svn.reactos.org/svn/reactos?rev=57687&view=rev Log: [CONSRV] Code formatting only. Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Wed Nov 7 21:16:09 2012 @@ -310,7 +310,7 @@ } DWORD WINAPI -TuiConsoleThread (PVOID Data) +TuiConsoleThread(PVOID Data) { PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Data; HWND NewWindow; @@ -384,7 +384,7 @@ Console->ActiveBuffer->MaxX = PhysicalConsoleSize.X; Console->ActiveBuffer->MaxY = PhysicalConsoleSize.Y; - ThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) TuiConsoleThread, + ThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)TuiConsoleThread, Console, 0, NULL); if (NULL == ThreadHandle) {

1 0

[hbelusca] 57686: [CONSRV] - Use the new PCONSOLE_PROCESS_DATA type instead of PCSR_PROCESS, for accessing console-specific fields inside a console structure (the code modifications inside these fu...
by hbelusca＠svn.reactos.org 07 Nov '12

07 Nov '12

Author: hbelusca Date: Wed Nov 7 21:10:48 2012 New Revision: 57686 URL: http://svn.reactos.org/svn/reactos?rev=57686&view=rev Log: [CONSRV] - Use the new PCONSOLE_PROCESS_DATA type instead of PCSR_PROCESS, for accessing console-specific fields inside a console structure (the code modifications inside these functions will follow in the next commits). - Remove unneeded included header files in consrv.h. - Use a DLL instance in order to facilitate the access to win32 resources. - Activate the declaration of server apis (or rename existing ones to the Windows scheme from the http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 list). - Comment the Win32CsrValidateBuffer helper (because it should be replaced by the usage of CsrValidateMessageBuffer). - Add the list of the old APIs (just for me, to remember at the end to check that I didn't forget ome of them during the process of moving / renaming). Modified: branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/consrv/server.c Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Wed Nov 7 21:10:48 2012 @@ -136,13 +136,15 @@ #define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer(Console, Buff, Size) /* console.c */ -NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSR_PROCESS ProcessData, PCSRSS_CONSOLE *Console); +NTSTATUS FASTCALL ConioConsoleFromProcessData(PCONSOLE_PROCESS_DATA ProcessData, + PCSRSS_CONSOLE *Console); VOID WINAPI ConioDeleteConsole(Object_t *Object); VOID WINAPI CsrInitConsoleSupport(VOID); VOID FASTCALL ConioPause(PCSRSS_CONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags); -VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSR_PROCESS ProcessData); -VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, +VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData); +VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, + PCONSOLE_PROCESS_DATA ProcessData, DWORD Timeout); /* coninput.c */ 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] Wed Nov 7 21:10:48 2012 @@ -21,11 +21,8 @@ #include <csr/csrsrv.h> /* CONSOLE Headers */ +#include <win/console.h> #include <win/conmsg.h> -// #include <win/base.h> - -//#include "guiconsole.h" -//#include "tuiconsole.h" #include "resource.h" @@ -33,9 +30,12 @@ #include "console.h" +extern HINSTANCE ConSrvDllInstance; extern HANDLE ConSrvHeap; // extern HANDLE BaseSrvSharedHeap; // extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; + + typedef struct Object_tt { @@ -47,6 +47,16 @@ } Object_t; +typedef struct _CSRSS_HANDLE +{ + Object_t *Object; + DWORD Access; + BOOL Inheritable; + DWORD ShareMode; +} CSRSS_HANDLE, *PCSRSS_HANDLE; + + + /* alias.c */ CSR_API(SrvAddConsoleAlias); CSR_API(SrvGetConsoleAlias); @@ -56,34 +66,31 @@ CSR_API(SrvGetConsoleAliasExesLength); /* coninput.c */ +CSR_API(SrvGetConsoleInput); +CSR_API(SrvWriteConsoleInput); CSR_API(SrvReadConsole); -CSR_API(CsrReadInputEvent); CSR_API(SrvFlushConsoleInputBuffer); CSR_API(SrvGetConsoleNumberOfInputEvents); -CSR_API(SrvGetConsoleInput); -CSR_API(SrvWriteConsoleInput); /* conoutput.c */ +CSR_API(SrvReadConsoleOutput); +CSR_API(SrvWriteConsoleOutput); +CSR_API(SrvReadConsoleOutputString); +CSR_API(SrvWriteConsoleOutputString); +CSR_API(SrvFillConsoleOutput); CSR_API(SrvWriteConsole); -CSR_API(SrvGetConsoleScreenBufferInfo); -CSR_API(SrvSetConsoleCursor); -CSR_API(CsrWriteConsoleOutputChar); -CSR_API(CsrFillOutputChar); -CSR_API(CsrWriteConsoleOutputAttrib); -CSR_API(CsrFillOutputAttrib); +CSR_API(SrvSetConsoleCursorPosition); CSR_API(SrvGetConsoleCursorInfo); CSR_API(SrvSetConsoleCursorInfo); -CSR_API(CsrSetTextAttrib); +CSR_API(SrvSetConsoleTextAttribute); CSR_API(SrvCreateConsoleScreenBuffer); +CSR_API(SrvGetConsoleScreenBufferInfo); CSR_API(SrvSetConsoleActiveScreenBuffer); -CSR_API(SrvWriteConsoleOutput); CSR_API(SrvScrollConsoleScreenBuffer); -CSR_API(CsrReadConsoleOutputChar); -CSR_API(CsrReadConsoleOutputAttrib); -CSR_API(SrvReadConsoleOutput); CSR_API(SrvSetConsoleScreenBufferSize); /* console.c */ +CSR_API(SrvOpenConsole); CSR_API(SrvAllocConsole); CSR_API(SrvFreeConsole); CSR_API(SrvSetConsoleMode); @@ -96,36 +103,34 @@ CSR_API(SrvSetConsoleIcon); CSR_API(SrvGetConsoleCP); CSR_API(SrvSetConsoleCP); -CSR_API(CsrGetConsoleOutputCodePage); -CSR_API(CsrSetConsoleOutputCodePage); CSR_API(SrvGetConsoleProcessList); CSR_API(SrvGenerateConsoleCtrlEvent); CSR_API(SrvGetConsoleSelectionInfo); /* handle.c */ -CSR_API(CsrGetHandle); CSR_API(SrvCloseHandle); CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvDuplicateHandle); CSR_API(CsrGetInputWaitHandle); -NTSTATUS FASTCALL Win32CsrInsertObject(PCSR_PROCESS ProcessData, +NTSTATUS NTAPI ConsoleNewProcess(PCSR_PROCESS SourceProcess, + PCSR_PROCESS TargetProcess); +VOID NTAPI Win32CsrReleaseConsole(PCSR_PROCESS Process); + +NTSTATUS FASTCALL Win32CsrInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable, DWORD ShareMode); -NTSTATUS FASTCALL Win32CsrLockObject(PCSR_PROCESS ProcessData, +NTSTATUS FASTCALL Win32CsrLockObject(PCONSOLE_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access, - long Type); + LONG Type); VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); -NTSTATUS FASTCALL Win32CsrReleaseObject(PCSR_PROCESS ProcessData, - HANDLE Object); -VOID WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData); -NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSR_PROCESS SourceProcessData, - PCSR_PROCESS TargetProcessData); +NTSTATUS FASTCALL Win32CsrReleaseObject(PCONSOLE_PROCESS_DATA ProcessData, + HANDLE Handle); /* lineinput.c */ CSR_API(SrvGetConsoleCommandHistoryLength); @@ -136,10 +141,12 @@ CSR_API(SrvSetConsoleHistory); /* server.c */ +#if 0 BOOL FASTCALL Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, SIZE_T NumElements, SIZE_T ElementSize); +#endif #endif // __CONSRV_H__ 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] Wed Nov 7 21:10:48 2012 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -HANDLE DllHandle = NULL; +HINSTANCE ConSrvDllInstance = NULL; // HANDLE BaseApiPort = NULL; /* Memory */ @@ -25,14 +25,14 @@ // Some names are also deduced from the subsystems/win32/csrss/csrsrv/server.c ones. PCSR_API_ROUTINE ConsoleServerApiDispatchTable[ConsolepMaxApiNumber] = { - // SrvOpenConsole, + SrvOpenConsole, SrvGetConsoleInput, SrvWriteConsoleInput, SrvReadConsoleOutput, SrvWriteConsoleOutput, - // SrvReadConsoleOutputString, - // SrvWriteConsoleOutputString, - // SrvFillConsoleOutput, + SrvReadConsoleOutputString, + SrvWriteConsoleOutputString, + SrvFillConsoleOutput, SrvGetConsoleMode, // SrvGetConsoleNumberOfFonts, SrvGetConsoleNumberOfInputEvents, @@ -47,11 +47,11 @@ SrvFlushConsoleInputBuffer, // SrvGetLargestConsoleWindowSize, SrvSetConsoleScreenBufferSize, - // SrvSetConsoleCursorPosition, + SrvSetConsoleCursorPosition, SrvSetConsoleCursorInfo, // SrvSetConsoleWindowInfo, SrvScrollConsoleScreenBuffer, - // SrvSetConsoleTextAttribute, + SrvSetConsoleTextAttribute, // SrvSetConsoleFont, SrvSetConsoleIcon, SrvReadConsole, @@ -68,7 +68,7 @@ SrvCreateConsoleScreenBuffer, // SrvInvalidateBitMapRect, // SrvVDMConsoleOperation, - SrvSetConsoleCursor, + // SrvSetConsoleCursor, // SrvShowConsoleCursor, // SrvConsoleMenuControl, // SrvSetConsolePalette, @@ -116,14 +116,14 @@ BOOLEAN ConsoleServerApiServerValidTable[ConsolepMaxApiNumber] = { - // FALSE, // SrvOpenConsole, + FALSE, // SrvOpenConsole, FALSE, // SrvGetConsoleInput, FALSE, // SrvWriteConsoleInput, FALSE, // SrvReadConsoleOutput, FALSE, // SrvWriteConsoleOutput, - // FALSE, // SrvReadConsoleOutputString, - // FALSE, // SrvWriteConsoleOutputString, - // FALSE, // SrvFillConsoleOutput, + FALSE, // SrvReadConsoleOutputString, + FALSE, // SrvWriteConsoleOutputString, + FALSE, // SrvFillConsoleOutput, FALSE, // SrvGetConsoleMode, // FALSE, // SrvGetConsoleNumberOfFonts, FALSE, // SrvGetConsoleNumberOfInputEvents, @@ -138,11 +138,11 @@ FALSE, // SrvFlushConsoleInputBuffer, // FALSE, // SrvGetLargestConsoleWindowSize, FALSE, // SrvSetConsoleScreenBufferSize, - // FALSE, // SrvSetConsoleCursorPosition, + FALSE, // SrvSetConsoleCursorPosition, FALSE, // SrvSetConsoleCursorInfo, // FALSE, // SrvSetConsoleWindowInfo, FALSE, // SrvScrollConsoleScreenBuffer, - // FALSE, // SrvSetConsoleTextAttribute, + FALSE, // SrvSetConsoleTextAttribute, // FALSE, // SrvSetConsoleFont, FALSE, // SrvSetConsoleIcon, FALSE, // SrvReadConsole, @@ -159,7 +159,7 @@ FALSE, // SrvCreateConsoleScreenBuffer, // FALSE, // SrvInvalidateBitMapRect, // FALSE, // SrvVDMConsoleOperation, - FALSE, // SrvSetConsoleCursor, + // FALSE, // SrvSetConsoleCursor, // FALSE, // SrvShowConsoleCursor, // FALSE, // SrvConsoleMenuControl, // FALSE, // SrvSetConsolePalette, @@ -209,14 +209,14 @@ PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber] = { - // "OpenConsole", + "OpenConsole", "GetConsoleInput", "WriteConsoleInput", "ReadConsoleOutput", "WriteConsoleOutput", - // "ReadConsoleOutputString", - // "WriteConsoleOutputString", - // "FillConsoleOutput", + "ReadConsoleOutputString", + "WriteConsoleOutputString", + "FillConsoleOutput", "GetConsoleMode", // "GetConsoleNumberOfFonts", "GetConsoleNumberOfInputEvents", @@ -231,11 +231,11 @@ "FlushConsoleInputBuffer", // "GetLargestConsoleWindowSize", "SetConsoleScreenBufferSize", - // "SetConsoleCursorPosition", + "SetConsoleCursorPosition", "SetConsoleCursorInfo", // "SetConsoleWindowInfo", "ScrollConsoleScreenBuffer", - // "SetConsoleTextAttribute", + "SetConsoleTextAttribute", // "SetConsoleFont", "SetConsoleIcon", "ReadConsole", @@ -252,7 +252,7 @@ "CreateConsoleScreenBuffer", // "InvalidateBitMapRect", // "VDMConsoleOperation", - "SetConsoleCursor", + // "SetConsoleCursor", // "ShowConsoleCursor", // "ConsoleMenuControl", // "SetConsolePalette", @@ -301,6 +301,106 @@ }; +/* +PCSR_API_ROUTINE Win32CsrApiDefinitions[] = +{ + CsrGetHandle, + CsrGetHandle, + CsrCloseHandle, + CsrVerifyHandle, + CsrDuplicateHandle, + CsrGetInputWaitHandle, + CsrFillOutputChar, + CsrReadInputEvent, + CsrWriteConsoleOutputChar, + CsrWriteConsoleOutputAttrib, + CsrFillOutputAttrib, + CsrSetTextAttrib, + CsrWriteConsoleOutput, + CsrFlushInputBuffer, + CsrReadConsoleOutputChar, + CsrReadConsoleOutputAttrib, + CsrExitReactos, + CsrHardwareStateProperty, + CsrCreateDesktop, + CsrShowDesktop, + CsrHideDesktop, + CsrSetLogonNotifyWindow, + CsrRegisterLogonProcess, + CsrGenerateCtrlEvent, +}; + +static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = +{ + CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetHandle), + CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetHandle), + CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), + CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), + CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), + CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), + CSRSS_DEFINE_API(WRITE_CONSOLE, CsrWriteConsole), + CSRSS_DEFINE_API(READ_CONSOLE, CsrReadConsole), + CSRSS_DEFINE_API(ALLOC_CONSOLE, CsrAllocConsole), + CSRSS_DEFINE_API(FREE_CONSOLE, CsrFreeConsole), + CSRSS_DEFINE_API(SCREEN_BUFFER_INFO, CsrGetScreenBufferInfo), + CSRSS_DEFINE_API(SET_CURSOR, CsrSetCursor), + CSRSS_DEFINE_API(FILL_OUTPUT, CsrFillOutputChar), + CSRSS_DEFINE_API(READ_INPUT, CsrReadInputEvent), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_CHAR, CsrWriteConsoleOutputChar), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_ATTRIB, CsrWriteConsoleOutputAttrib), + CSRSS_DEFINE_API(FILL_OUTPUT_ATTRIB, CsrFillOutputAttrib), + CSRSS_DEFINE_API(GET_CURSOR_INFO, CsrGetCursorInfo), + CSRSS_DEFINE_API(SET_CURSOR_INFO, CsrSetCursorInfo), + CSRSS_DEFINE_API(SET_ATTRIB, CsrSetTextAttrib), + CSRSS_DEFINE_API(GET_CONSOLE_MODE, CsrGetConsoleMode), + CSRSS_DEFINE_API(SET_CONSOLE_MODE, CsrSetConsoleMode), + CSRSS_DEFINE_API(CREATE_SCREEN_BUFFER, CsrCreateScreenBuffer), + CSRSS_DEFINE_API(SET_SCREEN_BUFFER, CsrSetScreenBuffer), + CSRSS_DEFINE_API(SET_TITLE, CsrSetTitle), + CSRSS_DEFINE_API(GET_TITLE, CsrGetTitle), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT, CsrWriteConsoleOutput), + CSRSS_DEFINE_API(FLUSH_INPUT_BUFFER, CsrFlushInputBuffer), + CSRSS_DEFINE_API(SCROLL_CONSOLE_SCREEN_BUFFER, CsrScrollConsoleScreenBuffer), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_CHAR, CsrReadConsoleOutputChar), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_ATTRIB, CsrReadConsoleOutputAttrib), + CSRSS_DEFINE_API(GET_NUM_INPUT_EVENTS, CsrGetNumberOfConsoleInputEvents), + CSRSS_DEFINE_API(EXIT_REACTOS, CsrExitReactos), + CSRSS_DEFINE_API(PEEK_CONSOLE_INPUT, CsrPeekConsoleInput), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT, CsrReadConsoleOutput), + CSRSS_DEFINE_API(WRITE_CONSOLE_INPUT, CsrWriteConsoleInput), + CSRSS_DEFINE_API(SETGET_CONSOLE_HW_STATE, CsrHardwareStateProperty), + CSRSS_DEFINE_API(GET_CONSOLE_WINDOW, CsrGetConsoleWindow), + CSRSS_DEFINE_API(CREATE_DESKTOP, CsrCreateDesktop), + CSRSS_DEFINE_API(SHOW_DESKTOP, CsrShowDesktop), + CSRSS_DEFINE_API(HIDE_DESKTOP, CsrHideDesktop), + CSRSS_DEFINE_API(SET_CONSOLE_ICON, CsrSetConsoleIcon), + CSRSS_DEFINE_API(SET_LOGON_NOTIFY_WINDOW, CsrSetLogonNotifyWindow), + CSRSS_DEFINE_API(REGISTER_LOGON_PROCESS, CsrRegisterLogonProcess), + CSRSS_DEFINE_API(GET_CONSOLE_CP, CsrGetConsoleCodePage), + CSRSS_DEFINE_API(SET_CONSOLE_CP, CsrSetConsoleCodePage), + CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), + CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), + CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), + CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), + CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), + CSRSS_DEFINE_API(GENERATE_CTRL_EVENT, CsrGenerateCtrlEvent), + CSRSS_DEFINE_API(SET_SCREEN_BUFFER_SIZE, CsrSetScreenBufferSize), + CSRSS_DEFINE_API(GET_CONSOLE_SELECTION_INFO, CsrGetConsoleSelectionInfo), + CSRSS_DEFINE_API(GET_COMMAND_HISTORY_LENGTH, CsrGetCommandHistoryLength), + CSRSS_DEFINE_API(GET_COMMAND_HISTORY, CsrGetCommandHistory), + CSRSS_DEFINE_API(EXPUNGE_COMMAND_HISTORY, CsrExpungeCommandHistory), + CSRSS_DEFINE_API(SET_HISTORY_NUMBER_COMMANDS, CsrSetHistoryNumberCommands), + CSRSS_DEFINE_API(GET_HISTORY_INFO, CsrGetHistoryInfo), + CSRSS_DEFINE_API(SET_HISTORY_INFO, CsrSetHistoryInfo), + { 0, 0, NULL } +}; +*/ + + /* FUNCTIONS ******************************************************************/ /* @@ -362,7 +462,7 @@ LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = Win32CsrReleaseConsole; - LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; + LoadedServerDll->NewProcessCallback = ConsoleNewProcess; // LoadedServerDll->HardErrorCallback = Win32CsrHardError; /* All done */ @@ -371,7 +471,7 @@ BOOL WINAPI -DllMain(IN HANDLE hDll, +DllMain(IN HINSTANCE hInstanceDll, IN DWORD dwReason, IN LPVOID lpReserved) { @@ -380,7 +480,7 @@ if (DLL_PROCESS_ATTACH == dwReason) { - DllHandle = hDll; + ConSrvDllInstance = hInstanceDll; } return TRUE; Modified: branches/ros-csrss/win32ss/user/consrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/server.c [iso-8859-1] Wed Nov 7 21:10:48 2012 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> - +#if 0 /* Ensure that a captured buffer is safe to access */ BOOL FASTCALL Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, @@ -37,5 +37,6 @@ } return TRUE; } +#endif /* EOF */

1 0

[hbelusca] 57685: [CONSRV] Add a new header containing per-process console-specific structure CSRSS_CON_PROCESS_DATA (it is stored inside one of the element of the ServerData array inside the CSR_P...
by hbelusca＠svn.reactos.org 07 Nov '12

07 Nov '12

Author: hbelusca Date: Wed Nov 7 21:04:47 2012 New Revision: 57685 URL: http://svn.reactos.org/svn/reactos?rev=57685&view=rev Log: [CONSRV] Add a new header containing per-process console-specific structure CSRSS_CON_PROCESS_DATA (it is stored inside one of the element of the ServerData array inside the CSR_PROCESS structure). It was deleted from csrsrv.h in revision r57673 and reappears here. Also add a macro in order to facilitate its access inside consrv. Added: branches/ros-csrss/include/reactos/subsys/win/console.h (with props) Added: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/console.h (added) +++ branches/ros-csrss/include/reactos/subsys/win/console.h [iso-8859-1] Wed Nov 7 21:04:47 2012 @@ -1,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/console.h + * PURPOSE: Public definitions for Console API Clients + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _CONSOLE_H +#define _CONSOLE_H + +#pragma once + +#define ConsoleGetPerProcessData(pcsrprocess) \ + ((PCONSOLE_PROCESS_DATA)((pcsrprocess)->ServerData[CONSRV_SERVERDLL_INDEX])) + + +typedef struct _CONSOLE_PROCESS_DATA +{ + LIST_ENTRY ConsoleLink; + PCSR_PROCESS Process; // Parent process. + HANDLE ConsoleEvent; + /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* Console; + /* PCSRSS_CONSOLE */ struct tagCSRSS_CONSOLE* ParentConsole; + BOOL bInheritHandles; + RTL_CRITICAL_SECTION HandleTableLock; + ULONG HandleTableSize; + /* PCSRSS_HANDLE */ struct _CSRSS_HANDLE* HandleTable; // Is it a length-varying table or length-fixed ?? + LPTHREAD_START_ROUTINE CtrlDispatcher; +} CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA; + +#endif // _CONSOLE_H + +/* EOF */ Propchange: branches/ros-csrss/include/reactos/subsys/win/console.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 57684: [NETAPI32] NetLocalGroupEnum: Make sure that built-in aliases are retrieved once and only one alias is enumerated upon each consecutive call. Retrieve name and comment for each alias.
by ekohl＠svn.reactos.org 07 Nov '12

07 Nov '12

Author: ekohl Date: Wed Nov 7 18:51:38 2012 New Revision: 57684 URL: http://svn.reactos.org/svn/reactos?rev=57684&view=rev Log: [NETAPI32] NetLocalGroupEnum: Make sure that built-in aliases are retrieved once and only one alias is enumerated upon each consecutive call. Retrieve name and comment for each alias. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Nov 7 18:51:38 2012 @@ -49,8 +49,10 @@ SAM_HANDLE AccountDomainHandle; SAM_ENUMERATE_HANDLE EnumerationContext; - PSAM_RID_ENUMERATION EnumBuffer; - ULONG EnumReturned; + PSAM_RID_ENUMERATION Buffer; + ULONG Returned; + ULONG Index; + BOOLEAN BuiltinDone; } ENUM_CONTEXT, *PENUM_CONTEXT; @@ -241,9 +243,12 @@ LPDWORD totalentries, PDWORD_PTR resumehandle) { + PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; PSID DomainSid = NULL; ULONG i; + SAM_HANDLE AliasHandle = NULL; + PALIAS_GENERAL_INFORMATION AliasInfo = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -267,8 +272,10 @@ goto done; EnumContext->EnumerationContext = 0; - EnumContext->EnumBuffer = NULL; - EnumContext->EnumReturned = 0; + EnumContext->Buffer = NULL; + EnumContext->Returned = 0; + EnumContext->Index = 0; + EnumContext->BuiltinDone = FALSE; Status = SamConnect(NULL, &EnumContext->ServerHandle, @@ -290,7 +297,7 @@ } Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, DomainSid, &EnumContext->AccountDomainHandle); @@ -312,7 +319,7 @@ } Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, DomainSid, &EnumContext->BuiltinDomainHandle); @@ -326,40 +333,96 @@ } } + while (TRUE) { - Status = SamEnumerateAliasesInDomain(EnumContext->BuiltinDomainHandle, - &EnumContext->EnumerationContext, - (PVOID *)&EnumContext->EnumBuffer, - prefmaxlen, - &EnumContext->EnumReturned); - - TRACE("SamEnumerateAliasesInDomain returned (Status %08lx)\n", Status); - - if (!NT_SUCCESS(Status)) - { - ERR("SamEnumerateAliasesInDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; + + if (EnumContext->Index >= EnumContext->Returned) + { + if (EnumContext->BuiltinDone == TRUE) + { + ApiStatus = NERR_Success; + goto done; + } + + TRACE("Calling SamEnumerateAliasesInDomain\n"); + + Status = SamEnumerateAliasesInDomain(EnumContext->BuiltinDomainHandle, + &EnumContext->EnumerationContext, + (PVOID *)&EnumContext->Buffer, + prefmaxlen, + &EnumContext->Returned); + + TRACE("SamEnumerateAliasesInDomain returned (Status %08lx)\n", Status); + if (!NT_SUCCESS(Status)) + { + ERR("SamEnumerateAliasesInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (Status == STATUS_MORE_ENTRIES) + { + ApiStatus = NERR_BufTooSmall; + goto done; + } + else + { + EnumContext->BuiltinDone = TRUE; + } } TRACE("EnumContext: %lu\n", EnumContext); - TRACE("EnumReturned: %lu\n", EnumContext->EnumReturned); - TRACE("EnumBuffer: %p\n", EnumContext->EnumBuffer); - - for (i = 0; i < EnumContext->EnumReturned; i++) - { - TRACE("RID: %lu\n", EnumContext->EnumBuffer[i].RelativeId); - TRACE("Name: %p\n", EnumContext->EnumBuffer[i].Name.Buffer); - TRACE("Name: %S\n", EnumContext->EnumBuffer[i].Name.Buffer); - if (EnumContext->EnumBuffer[i].Name.Buffer != NULL) - { - TRACE("Name: %hx\n", EnumContext->EnumBuffer[i].Name.Buffer[0]); - } - } - - if (Status != STATUS_MORE_ENTRIES) - break; + TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); + TRACE("EnumContext->Buffer: %p\n", EnumContext->Buffer); + + /* Get a pointer to the current alias */ + CurrentAlias = &EnumContext->Buffer[EnumContext->Index]; + + TRACE("RID: %lu\n", CurrentAlias->RelativeId); + + Status = SamOpenAlias(EnumContext->BuiltinDomainHandle, + ALIAS_READ_INFORMATION, + CurrentAlias->RelativeId, + &AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamQueryInformationAlias(AliasHandle, + AliasGeneralInformation, + (PVOID *)&AliasInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + SamCloseHandle(AliasHandle); + AliasHandle = NULL; + + TRACE("Name: %S\n", AliasInfo->Name.Buffer); + TRACE("Comment: %S\n", AliasInfo->AdminComment.Buffer); + + + if (AliasInfo != NULL) + { + if (AliasInfo->Name.Buffer != NULL) + SamFreeMemory(AliasInfo->Name.Buffer); + + if (AliasInfo->AdminComment.Buffer != NULL) + SamFreeMemory(AliasInfo->AdminComment.Buffer); + + SamFreeMemory(AliasInfo); + AliasInfo = NULL; + } + + + EnumContext->Index++; } @@ -377,14 +440,14 @@ if (EnumContext->ServerHandle != NULL) SamCloseHandle(EnumContext->ServerHandle); - if (EnumContext->EnumBuffer != NULL) + if (EnumContext->Buffer != NULL) { - for (i = 0; i < EnumContext->EnumReturned; i++) + for (i = 0; i < EnumContext->Returned; i++) { - SamFreeMemory(EnumContext->EnumBuffer[i].Name.Buffer); + SamFreeMemory(EnumContext->Buffer[i].Name.Buffer); } - SamFreeMemory(EnumContext->EnumBuffer); + SamFreeMemory(EnumContext->Buffer); } NetApiBufferFree(EnumContext); @@ -392,6 +455,19 @@ } } + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (AliasInfo != NULL) + { + if (AliasInfo->Name.Buffer != NULL) + SamFreeMemory(AliasInfo->Name.Buffer); + + if (AliasInfo->AdminComment.Buffer != NULL) + SamFreeMemory(AliasInfo->AdminComment.Buffer); + + SamFreeMemory(AliasInfo); + } if (resumehandle != NULL) *resumehandle = (DWORD_PTR)EnumContext;

1 0

[ekohl] 57683: [SAMSRV] Fix build.
by ekohl＠svn.reactos.org 06 Nov '12

06 Nov '12

Author: ekohl Date: Tue Nov 6 23:47:43 2012 New Revision: 57683 URL: http://svn.reactos.org/svn/reactos?rev=57683&view=rev Log: [SAMSRV] Fix build. 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] Tue Nov 6 23:47:43 2012 @@ -3827,8 +3827,6 @@ return Status; } - AliasObject->Special.Alias.RelativeId = AliasId; - *AliasHandle = (SAMPR_HANDLE)AliasObject; return STATUS_SUCCESS;

1 0

[ekohl] 57682: [SAMSRV] SamrQueryInformationAlias: When retrieving general information, return a member count of zero if the members sub key does not exist.
by ekohl＠svn.reactos.org 06 Nov '12

06 Nov '12

Author: ekohl Date: Tue Nov 6 23:39:59 2012 New Revision: 57682 URL: http://svn.reactos.org/svn/reactos?rev=57682&view=rev Log: [SAMSRV] SamrQueryInformationAlias: When retrieving general information, return a member count of zero if the members sub key does not exist. 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] Tue Nov 6 23:39:59 2012 @@ -154,6 +154,7 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + /* Function 5 */ NTSTATUS @@ -263,6 +264,7 @@ return Status; } + /* Function 6 */ NTSTATUS @@ -3825,6 +3827,8 @@ return Status; } + AliasObject->Special.Alias.RelativeId = AliasId; + *AliasHandle = (SAMPR_HANDLE)AliasObject; return STATUS_SUCCESS; @@ -3868,17 +3872,24 @@ 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)) + if (NT_SUCCESS(Status)) + { + /* 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; + } + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + InfoBuffer->General.MemberCount = 0; + Status = STATUS_SUCCESS; + } + else { TRACE("Status 0x%08lx\n", Status); goto done;

1 0

[jgardou] 57681: [USER32_APITEST] - Test behaviour with icons handle from foreign process
by jgardou＠svn.reactos.org 06 Nov '12

06 Nov '12

Author: jgardou Date: Tue Nov 6 14:27:03 2012 New Revision: 57681 URL: http://svn.reactos.org/svn/reactos?rev=57681&view=rev Log: [USER32_APITEST] - Test behaviour with icons handle from foreign process Modified: trunk/rostests/apitests/user32/LoadImage.c Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Tue Nov 6 14:27:03 2012 @@ -21,10 +21,48 @@ if (argc >= 3) { HANDLE arg; + HICON hCopy; + HBITMAP hbmp; + HDC hdc, hdcScreen; + ICONINFO ii; sscanf (test_argv[2], "%lu", (ULONG_PTR*) &arg); ok(handle != arg, "Got same handles\n"); + + /* Try copying it */ + hCopy = CopyIcon(arg); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, 0); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_COPYFROMRESOURCE); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + + /* Try various usual functions */ + hdcScreen = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + ok(hdcScreen != NULL, "\n"); + hdc = CreateCompatibleDC(hdcScreen); + ok(hdc != NULL, "\n"); + hbmp = CreateCompatibleBitmap(hdcScreen, 64, 64); + ok(hbmp != NULL, "\n"); + hbmp = SelectObject(hdc, hbmp); + ok(hbmp != NULL, "\n"); + + ok(DrawIcon(hdc, 0, 0, arg), "\n"); + hbmp = SelectObject(hdc, hbmp); + DeleteObject(hbmp); + DeleteDC(hdc); + DeleteDC(hdcScreen); + + ok(GetIconInfo(arg, &ii), "\n"); + ok(ii.hbmMask != NULL, "\n"); + DeleteObject(ii.hbmMask); + if(ii.hbmColor) DeleteObject(ii.hbmColor); return; } @@ -35,4 +73,4 @@ si.cb = sizeof(si); CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi ); WaitForSingleObject (pi.hProcess, INFINITE); -} +}

1 0

[jgardou] 57680: [USER32] - Link to msvcrtex in MSC builds
by jgardou＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: jgardou Date: Mon Nov 5 23:29:52 2012 New Revision: 57680 URL: http://svn.reactos.org/svn/reactos?rev=57680&view=rev Log: [USER32] - Link to msvcrtex in MSC builds Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Mon Nov 5 23:29:52 2012 @@ -82,6 +82,11 @@ win32ksys ${PSEH_LIB}) +if(MSVC) + # for __ftol2_sse, float to int cast helper + target_link_libraries(user32 msvcrtex) +endif() + add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h)

1 0

[jgardou] 57679: [USER32] - Avoid more rounding issues and hopefully fix MSC build
by jgardou＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: jgardou Date: Mon Nov 5 22:51:32 2012 New Revision: 57679 URL: http://svn.reactos.org/svn/reactos?rev=57679&view=rev Log: [USER32] - Avoid more rounding issues and hopefully fix MSC build Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Mon Nov 5 22:51:32 2012 @@ -400,7 +400,7 @@ tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; - ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (1.5*line_def->net_length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (3*line_def->net_length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); if (es->font) SelectObject(udc, old_font);

1 0

[ekohl] 57678: [NETAPI32] Start the implementation of NetpNtStatusToApiStatus and NetLocalGroupEnum.
by ekohl＠svn.reactos.org 05 Nov '12

05 Nov '12

Author: ekohl Date: Mon Nov 5 22:51:08 2012 New Revision: 57678 URL: http://svn.reactos.org/svn/reactos?rev=57678&view=rev Log: [NETAPI32] Start the implementation of NetpNtStatusToApiStatus and NetLocalGroupEnum. Added: trunk/reactos/dll/win32/netapi32/netapi32.h (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Mon Nov 5 22:51:08 2012 @@ -28,5 +28,7 @@ add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) +add_delay_importlibs(netapi32 samlib) + add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Mon Nov 5 22:51:08 2012 @@ -34,7 +34,119 @@ #include "wine/debug.h" #include "wine/unicode.h" +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "ntsam.h" +#include "netapi32.h" + WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + + +typedef struct _ENUM_CONTEXT +{ + SAM_HANDLE ServerHandle; + SAM_HANDLE BuiltinDomainHandle; + SAM_HANDLE AccountDomainHandle; + + SAM_ENUMERATE_HANDLE EnumerationContext; + PSAM_RID_ENUMERATION EnumBuffer; + ULONG EnumReturned; + +} ENUM_CONTEXT, *PENUM_CONTEXT; + +static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + + +static +NTSTATUS +GetAccountDomainSid(PSID *AccountDomainSid) +{ + PPOLICY_ACCOUNT_DOMAIN_INFO AccountDomainInfo = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + ULONG Length = 0; + NTSTATUS Status; + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaOpenPolicy failed (Status %08lx)\n", Status); + return Status; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&AccountDomainInfo); + if (!NT_SUCCESS(Status)) + { + ERR("LsaQueryInformationPolicy failed (Status %08lx)\n", Status); + goto done; + } + + Length = RtlLengthSid(AccountDomainInfo->DomainSid); + + *AccountDomainSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (*AccountDomainSid == NULL) + { + ERR("Failed to allocate SID\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(*AccountDomainSid, AccountDomainInfo->DomainSid, Length); + +done: + if (AccountDomainInfo != NULL) + LsaFreeMemory(AccountDomainInfo); + + LsaClose(PolicyHandle); + + return Status; +} + + +static +NTSTATUS +GetBuiltinDomainSid(PSID *BuiltinDomainSid) +{ + PSID Sid = NULL; + PULONG Ptr; + NTSTATUS Status = STATUS_SUCCESS; + + *BuiltinDomainSid = NULL; + + Sid = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + RtlLengthRequiredSid(1)); + if (Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = RtlInitializeSid(Sid, + &NtAuthority, + 1); + if (!NT_SUCCESS(Status)) + goto done; + + Ptr = RtlSubAuthoritySid(Sid, 0); + *Ptr = SECURITY_BUILTIN_DOMAIN_RID; + + *BuiltinDomainSid = Sid; + +done: + if (!NT_SUCCESS(Status)) + { + if (Sid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sid); + } + + return Status; +} + /************************************************************ * NetLocalGroupAdd (NETAPI32.@) @@ -129,11 +241,162 @@ LPDWORD totalentries, PDWORD_PTR resumehandle) { + PENUM_CONTEXT EnumContext = NULL; + PSID DomainSid = NULL; + ULONG i; + + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + *entriesread = 0; *totalentries = 0; - return NERR_Success; + *bufptr = NULL; + + if (resumehandle != NULL && *resumehandle != 0) + { + EnumContext = (PENUM_CONTEXT)resumehandle; + } + else + { + ApiStatus = NetApiBufferAllocate(sizeof(ENUM_CONTEXT), (PVOID*)&EnumContext); + if (ApiStatus != NERR_Success) + goto done; + + EnumContext->EnumerationContext = 0; + EnumContext->EnumBuffer = NULL; + EnumContext->EnumReturned = 0; + + Status = SamConnect(NULL, + &EnumContext->ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = GetAccountDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamOpenDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS, + DomainSid, + &EnumContext->AccountDomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = SamOpenDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS, + DomainSid, + &EnumContext->BuiltinDomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + + while (TRUE) + { + Status = SamEnumerateAliasesInDomain(EnumContext->BuiltinDomainHandle, + &EnumContext->EnumerationContext, + (PVOID *)&EnumContext->EnumBuffer, + prefmaxlen, + &EnumContext->EnumReturned); + + TRACE("SamEnumerateAliasesInDomain returned (Status %08lx)\n", Status); + + if (!NT_SUCCESS(Status)) + { + ERR("SamEnumerateAliasesInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + TRACE("EnumContext: %lu\n", EnumContext); + TRACE("EnumReturned: %lu\n", EnumContext->EnumReturned); + TRACE("EnumBuffer: %p\n", EnumContext->EnumBuffer); + + for (i = 0; i < EnumContext->EnumReturned; i++) + { + TRACE("RID: %lu\n", EnumContext->EnumBuffer[i].RelativeId); + TRACE("Name: %p\n", EnumContext->EnumBuffer[i].Name.Buffer); + TRACE("Name: %S\n", EnumContext->EnumBuffer[i].Name.Buffer); + if (EnumContext->EnumBuffer[i].Name.Buffer != NULL) + { + TRACE("Name: %hx\n", EnumContext->EnumBuffer[i].Name.Buffer[0]); + } + } + + if (Status != STATUS_MORE_ENTRIES) + break; + } + + +done: + if (resumehandle == NULL || ApiStatus != ERROR_MORE_DATA) + { + if (EnumContext != NULL) + { + if (EnumContext->BuiltinDomainHandle != NULL) + SamCloseHandle(EnumContext->BuiltinDomainHandle); + + if (EnumContext->AccountDomainHandle != NULL) + SamCloseHandle(EnumContext->AccountDomainHandle); + + if (EnumContext->ServerHandle != NULL) + SamCloseHandle(EnumContext->ServerHandle); + + if (EnumContext->EnumBuffer != NULL) + { + for (i = 0; i < EnumContext->EnumReturned; i++) + { + SamFreeMemory(EnumContext->EnumBuffer[i].Name.Buffer); + } + + SamFreeMemory(EnumContext->EnumBuffer); + } + + NetApiBufferFree(EnumContext); + EnumContext = NULL; + } + } + + + if (resumehandle != NULL) + *resumehandle = (DWORD_PTR)EnumContext; + + return ApiStatus; } /************************************************************ Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Mon Nov 5 22:51:08 2012 @@ -16,11 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include "config.h" #include "wine/debug.h" #include "lm.h" #include "netbios.h" + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); @@ -211,6 +216,13 @@ return ret; } +NET_API_STATUS +WINAPI +NetpNtStatusToApiStatus(NTSTATUS Status) +{ + return RtlNtStatusToDosError(Status); +} + NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { Added: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h (added) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Mon Nov 5 22:51:08 2012 @@ -1,0 +1,10 @@ + +#ifndef __WINE_NETAPI32_H__ +#define __WINE_NETAPI32_H__ + +NET_API_STATUS +WINAPI +NetpNtStatusToApiStatus(NTSTATUS Status); + + +#endif Propchange: trunk/reactos/dll/win32/netapi32/netapi32.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netapi32/netapi32.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Mon Nov 5 22:51:08 2012 @@ -261,7 +261,7 @@ @ stub NetpNetBiosReset @ stub NetpNetBiosSend @ stdcall NetpNetBiosStatusToApiStatus(long) -@ stub NetpNtStatusToApiStatus +@ stdcall NetpNtStatusToApiStatus(long) @ stub NetpOpenConfigData @ stub NetpPackString @ stub NetpReleasePrivilege

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