Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[hbelusca] 65693: [WIN32K] Stubplement NtUserQueryInformationThread and NtUserSetInformationThread that will be used for: - shutdown support: CORE-8322 - communicating a CSR Port handle to win32k: ...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 23:09:29 2014 New Revision: 65693 URL: http://svn.reactos.org/svn/reactos?rev=65693&view=rev Log: [WIN32K] Stubplement NtUserQueryInformationThread and NtUserSetInformationThread that will be used for: - shutdown support: CORE-8322 - communicating a CSR Port handle to win32k: CORE-7505 CORE-7505 CORE-8322 Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Tue Dec 16 23:09:29 2014 @@ -761,8 +761,39 @@ OUT PVOID ThreadInformation, IN ULONG ThreadInformationLength) { - STUB; - return STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + PETHREAD Thread; + + /* Allow only CSRSS to perform this operation */ + if (PsGetCurrentProcess() != gpepCSRSS) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + /* Get the Thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_QUERY_INFORMATION, + *PsThreadType, + UserMode, + (PVOID)&Thread, + NULL); + if (!NT_SUCCESS(Status)) goto Quit; + + switch (ThreadInformationClass) + { + default: + { + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + } + + ObDereferenceObject(Thread); + +Quit: + UserLeave(); + return Status; } DWORD @@ -861,20 +892,63 @@ IN ULONG ThreadInformationLength) { - if (ThreadInformationClass == UserThreadInitiateShutdown) + NTSTATUS Status = STATUS_SUCCESS; + PETHREAD Thread; + + /* Allow only CSRSS to perform this operation */ + if (PsGetCurrentProcess() != gpepCSRSS) + return STATUS_ACCESS_DENIED; + + UserEnterExclusive(); + + /* Get the Thread */ + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_SET_INFORMATION, + *PsThreadType, + UserMode, + (PVOID)&Thread, + NULL); + if (!NT_SUCCESS(Status)) goto Quit; + + switch (ThreadInformationClass) { - ERR("Shutdown initiated\n"); + case UserThreadInitiateShutdown: + { + ERR("Shutdown initiated\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + case UserThreadEndShutdown: + { + ERR("Shutdown ended\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + case UserThreadCsrApiPort: + { + ERR("Set CSR API Port for Win32k\n"); + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + default: + { + STUB; + Status = STATUS_NOT_IMPLEMENTED; + break; + } } - else if (ThreadInformationClass == UserThreadEndShutdown) - { - ERR("Shutdown ended\n"); - } - else - { - STUB; - } - - return STATUS_SUCCESS; + + ObDereferenceObject(Thread); + +Quit: + UserLeave(); + return Status; } DWORD

1 0

[hbelusca] 65692: ... And as a result of the previous commit, finally get rid of the "deprecated" directory!
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:59:50 2014 New Revision: 65692 URL: http://svn.reactos.org/svn/reactos?rev=65692&view=rev Log: ... And as a result of the previous commit, finally get rid of the "deprecated" directory! Removed: trunk/reactos/deprecated/

1 0

[hbelusca] 65691: [WIN32SS]: Push back csr code into win32k (not compiled yet). The thing is that win32k uses a LPC port to communicate with winsrv.dll . But it's winsrv.dll that gives a handle of ...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:58:18 2014 New Revision: 65691 URL: http://svn.reactos.org/svn/reactos?rev=65691&view=rev Log: [WIN32SS]: Push back csr code into win32k (not compiled yet). The thing is that win32k uses a LPC port to communicate with winsrv.dll . But it's winsrv.dll that gives a handle of the CSR port to win32k via a call to NtUserSetInformationThread with the UserThreadCsrApiPort information class. See part of Timo's patch in CORE-7505 that will be submitted later on. Also I need to somewhat stub the UserThreadCsrApiPort info class in NtUserSetInformationThread :) Added: trunk/reactos/win32ss/user/ntuser/csr.c - copied unchanged from r65683, trunk/reactos/deprecated/csr.c trunk/reactos/win32ss/user/ntuser/csr.h - copied unchanged from r65683, trunk/reactos/deprecated/csr.h Removed: trunk/reactos/deprecated/csr.c trunk/reactos/deprecated/csr.h Removed: trunk/reactos/deprecated/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/deprecated/csr.c?rev=65690 ============================================================================== --- trunk/reactos/deprecated/csr.c [iso-8859-1] (original) +++ trunk/reactos/deprecated/csr.c (removed) @@ -1,91 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/ntuser/csr.c - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) - */ - -#include <win32k.h> - -static HANDLE WindowsApiPort = NULL; -PEPROCESS CsrProcess = NULL; - -NTSTATUS FASTCALL -CsrInit(void) -{ - NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; - - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; - - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - CsrProcess = PsGetCurrentProcess(); - - return STATUS_SUCCESS; -} - - -NTSTATUS FASTCALL -co_CsrNotify(PCSR_API_MESSAGE Request) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } - - Request->Header.u2.ZeroInit = 0; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - UserLeaveCo(); - - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &Request->Header, - &Request->Header); - - UserEnterCo(); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - if (NT_SUCCESS(Status)) - { - Status = Request->Status; - } - - return Status; -} - -/* EOF */ Removed: trunk/reactos/deprecated/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/deprecated/csr.h?rev=65690 ============================================================================== --- trunk/reactos/deprecated/csr.h [iso-8859-1] (original) +++ trunk/reactos/deprecated/csr.h (removed) @@ -1,20 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Interface to csrss - * FILE: subsys/win32k/include/csr.h - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) - */ - -#pragma once - -extern PEPROCESS CsrProcess; - -NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); -NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); - -/* EOF */

1 0

[hbelusca] 65690: [KERNEL32][BASESRV] On Windows 2k3, BASESRV_API_CONNECTINFO went under a slimming treatment and now is only 4 bytes. In fact all its information was already existing in the static...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 21:48:23 2014 New Revision: 65690 URL: http://svn.reactos.org/svn/reactos?rev=65690&view=rev Log: [KERNEL32][BASESRV] On Windows 2k3, BASESRV_API_CONNECTINFO went under a slimming treatment and now is only 4 bytes. In fact all its information was already existing in the static base data structure (BaseStaticServerData). We should now be more 2k3-compatible :) Fix also the testbots. Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/basemsg.h Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -88,8 +88,8 @@ LPVOID lpReserved) { NTSTATUS Status; - ULONG Dummy; - ULONG DummySize = sizeof(Dummy); + BASESRV_API_CONNECTINFO ConnectInfo; + ULONG ConnectInfoSize = sizeof(ConnectInfo); WCHAR SessionDir[256]; DPRINT("DllMain(hInst %p, dwReason %lu)\n", @@ -133,11 +133,11 @@ WIN_OBJ_DIR); } - /* Connect to the base server */ + /* Connect to the Base Server */ Status = CsrClientConnectToServer(SessionDir, BASESRV_SERVERDLL_INDEX, - &Dummy, - &DummySize, + &ConnectInfo, + &ConnectInfoSize, &BaseRunningInServerProcess); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -131,7 +131,8 @@ BOOLEAN LUIDDeviceMapsEnabled; ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; -#ifndef _WIN64 + +#if defined(_M_IX86) C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); #endif Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Tue Dec 16 21:48:23 2014 @@ -53,19 +53,14 @@ BasepMaxApiNumber } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; - typedef struct _BASESRV_API_CONNECTINFO { - ULONG ExpectedVersion; - HANDLE DefaultObjectDirectory; - ULONG WindowsVersion; - ULONG CurrentVersion; - ULONG DebugFlags; - WCHAR WindowsDirectory[MAX_PATH]; - WCHAR WindowsSystemDirectory[MAX_PATH]; + ULONG DebugFlags; } BASESRV_API_CONNECTINFO, *PBASESRV_API_CONNECTINFO; -#define BASESRV_VERSION 0x10000 +#if defined(_M_IX86) +C_ASSERT(sizeof(BASESRV_API_CONNECTINFO) == 0x04); +#endif typedef struct _BASE_SXS_CREATEPROCESS_MSG

1 0

[tkreuzer] 65689: [SPEC2DEF] Improve error output
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:21:14 2014 New Revision: 65689 URL: http://svn.reactos.org/svn/reactos?rev=65689&view=rev Log: [SPEC2DEF] Improve error output Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 16 21:21:14 2014 @@ -879,7 +879,7 @@ /* Go to next token */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "fail4\n"); + fprintf(stderr, "error: line %d, expected token\n", nLine); return -13; }

1 0

[tkreuzer] 65688: [NTOSKRNL] Hey Arch, using uninitialized variables is bad, mkay?
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:15:57 2014 New Revision: 65688 URL: http://svn.reactos.org/svn/reactos?rev=65688&view=rev Log: [NTOSKRNL] Hey Arch, using uninitialized variables is bad, mkay? Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Tue Dec 16 21:15:57 2014 @@ -1245,7 +1245,7 @@ PIRP MasterIrp; ULONG Flags; NTSTATUS ErrorCode = STATUS_SUCCESS; - PREPARSE_DATA_BUFFER DataBuffer; + PREPARSE_DATA_BUFFER DataBuffer = NULL; IOTRACE(IO_IRP_DEBUG, "%s - Completing IRP %p\n", __FUNCTION__,

1 0

[tkreuzer] 65687: [EVENTVWR] Fix MSVC build and x64 warnings
by tkreuzer＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: tkreuzer Date: Tue Dec 16 21:03:24 2014 New Revision: 65687 URL: http://svn.reactos.org/svn/reactos?rev=65687&view=rev Log: [EVENTVWR] Fix MSVC build and x64 warnings Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Tue Dec 16 21:03:24 2014 @@ -54,6 +54,7 @@ #define EVENT_PARAMETER_MESSAGE_FILE L"ParameterMessageFile" #define MAX_LOADSTRING 255 +#define ENTRY_SIZE 2056 /* Globals */ HINSTANCE hInst; /* current instance */ @@ -723,7 +724,7 @@ 0, szTitleTemplate, szTitle, lpLogName); /* i = number of characters written */ /* lpComputerName can be NULL here if no records was read */ - dwMaxLength = cchRemaining; + dwMaxLength = (DWORD)cchRemaining; if (!lpComputerName) GetComputerNameW(lpTitleTemplateEnd, &dwMaxLength); else @@ -880,7 +881,7 @@ WCHAR *KeyPath; WCHAR szModuleName[MAX_PATH]; DWORD cbData; - DWORD cbKeyPath; + SIZE_T cbKeyPath; cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); @@ -916,7 +917,7 @@ WCHAR *KeyPath; DWORD dwMessageID = 0; DWORD cbData; - DWORD cbKeyPath; + SIZE_T cbKeyPath; cbKeyPath = (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR); KeyPath = HeapAlloc(GetProcessHeap(), 0, cbKeyPath); @@ -1444,7 +1445,6 @@ VOID CopyEventEntry(HWND hWnd) { - const SIZE_T entrySize = 2056; WCHAR output[4130], tmpHeader[512]; WCHAR szEventType[MAX_PATH]; WCHAR szSource[MAX_PATH]; @@ -1454,7 +1454,7 @@ WCHAR szTime[MAX_PATH]; WCHAR szUser[MAX_PATH]; WCHAR szComputer[MAX_PATH]; - WCHAR evtDesc[entrySize]; + WCHAR evtDesc[ENTRY_SIZE]; HGLOBAL hMem; if (!OpenClipboard(hWnd)) @@ -1475,14 +1475,14 @@ GetDlgItemText(hWnd, IDC_EVENTTIMESTATIC, szTime, MAX_PATH); GetDlgItemText(hWnd, IDC_EVENTUSERSTATIC, szUser, MAX_PATH); GetDlgItemText(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, MAX_PATH); - GetDlgItemText(hWnd, IDC_EVENTTEXTEDIT, evtDesc, entrySize); + GetDlgItemText(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ENTRY_SIZE); /* Consolidate the information into on big piece */ wsprintfW(output, tmpHeader, szEventType, szSource, szCategory, szEventID, szDate, szTime, szUser, szComputer, evtDesc); /* Sort out the memory needed to write to the clipboard */ - hMem = GlobalAlloc(GMEM_MOVEABLE, entrySize); - memcpy(GlobalLock(hMem), output, entrySize); + hMem = GlobalAlloc(GMEM_MOVEABLE, ENTRY_SIZE); + memcpy(GlobalLock(hMem), output, ENTRY_SIZE); GlobalUnlock(hMem); /* Write the final content to the clipboard */

1 0

[hbelusca] 65686: [BASESRV]: Use BaseSrvCleanupVDMResources taking a CSR_PROCESS structure instead of just its PID to be able to possibly use more things to do VDM cleanup (in the future).
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 20:28:44 2014 New Revision: 65686 URL: http://svn.reactos.org/svn/reactos?rev=65686&view=rev Log: [BASESRV]: Use BaseSrvCleanupVDMResources taking a CSR_PROCESS structure instead of just its PID to be able to possibly use more things to do VDM cleanup (in the future). Modified: trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/vdm.c trunk/reactos/subsystems/win/basesrv/vdm.h Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -599,8 +599,8 @@ NTAPI BaseClientDisconnectRoutine(IN PCSR_PROCESS CsrProcess) { - /* Cleanup the VDM console records */ - BaseSrvCleanupVdmRecords(HandleToUlong(CsrProcess->ClientId.UniqueProcess)); + /* Cleanup VDM resources */ + BaseSrvCleanupVDMResources(CsrProcess); } CSR_SERVER_DLL_INIT(ServerDllInitialization) Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -228,11 +228,14 @@ RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); } -VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId) -{ - PLIST_ENTRY i; +VOID +NTAPI +BaseSrvCleanupVDMResources(IN PCSR_PROCESS CsrProcess) +{ + ULONG ProcessId = HandleToUlong(CsrProcess->ClientId.UniqueProcess); PVDM_CONSOLE_RECORD ConsoleRecord = NULL; PVDM_DOS_RECORD DosRecord; + PLIST_ENTRY i; /* Enter the critical section */ RtlEnterCriticalSection(&DosCriticalSection); Modified: trunk/reactos/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.h [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -49,7 +49,7 @@ BOOLEAN NTAPI BaseSrvIsVdmAllowed(VOID); NTSTATUS NTAPI BaseSrvCreatePairWaitHandles(PHANDLE ServerEvent, PHANDLE ClientEvent); VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo); -VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId); +VOID NTAPI BaseSrvCleanupVDMResources(IN PCSR_PROCESS CsrProcess); BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord); NTSTATUS NTAPI BaseSrvFillCommandInfo( PVDM_COMMAND_INFO CommandInfo,

1 0

[hbelusca] 65685: [BASESRV]: basesrv exports few APIs used in winsrv, so declare basesrv as IMPORTLIB.
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 20:26:02 2014 New Revision: 65685 URL: http://svn.reactos.org/svn/reactos?rev=65685&view=rev Log: [BASESRV]: basesrv exports few APIs used in winsrv, so declare basesrv as IMPORTLIB. Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMa… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Tue Dec 16 20:26:02 2014 @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -spec2def(basesrv.dll basesrv.spec) +spec2def(basesrv.dll basesrv.spec ADD_IMPORTLIB) list(APPEND SOURCE appcompat.c Modified: trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/CM… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Tue Dec 16 20:26:02 2014 @@ -1,6 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + spec2def(csrsrv.dll csrsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE

1 0

[hbelusca] 65684: [BASESRV] - Introduce BaseClientConnectRoutine and BaseClientDisconnectRoutine functions that do basesrv (de)initialization, and BaseSrvNlsConnect that may potentially init furthe...
by hbelusca＠svn.reactos.org 16 Dec '14

16 Dec '14

Author: hbelusca Date: Tue Dec 16 20:15:35 2014 New Revision: 65684 URL: http://svn.reactos.org/svn/reactos?rev=65684&view=rev Log: [BASESRV] - Introduce BaseClientConnectRoutine and BaseClientDisconnectRoutine functions that do basesrv (de)initialization, and BaseSrvNlsConnect that may potentially init further NLS support in the future. - BaseSrvDebugProcess is deprecated in Windows 2k3+. - Few whitespace fixes. Piece of patch by Timo Kreuzer. CORE-7505 #comment Basesrv (dis)connect routines committed in r65684. Modified: trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/nls.c trunk/reactos/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/sndsntry.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -13,7 +13,7 @@ typedef BOOL -(CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)( +(CALLBACK *BASE_PROCESS_CREATE_NOTIFY_ROUTINE)( HANDLE NewProcessId, HANDLE SourceThreadId, DWORD dwUnknown, @@ -135,8 +135,6 @@ C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); #endif -VOID WINAPI BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData); - #endif // _BASE_H /* EOF */ Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -22,7 +22,7 @@ BasepCreateThread, BasepGetTempFile, BasepExitProcess, - BasepDebugProcess, + BasepDebugProcess, // Deprecated BasepCheckVDM, BasepUpdateVDMEntry, BasepGetNextVDMCommand, @@ -46,7 +46,7 @@ BasepNlsUpdateCacheCount, BasepSetTermsrvClientTimeZone, BasepSxsCreateActivationContext, - BasepUnknown, + BasepDebugProcessStop, // Alias to BasepDebugProcess, deprecated BasepRegisterThread, BasepNlsGetUserInfo, @@ -72,7 +72,7 @@ { ULONG Flags; ULONG ProcessParameterFlags; - HANDLE FileHandle; + HANDLE FileHandle; UNICODE_STRING SxsWin32ExePath; UNICODE_STRING SxsNtExePath; SIZE_T OverrideManifestOffset; Modified: trunk/reactos/subsystems/win/basesrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/api… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -29,7 +29,6 @@ CSR_API(BaseSrvSxsCreateActivationContext); CSR_API(BaseSrvSetTermsrvAppInstallMode); CSR_API(BaseSrvSetTermsrvClientTimeZone); -CSR_API(BaseSrvUnknown); /* sndsntry.c */ CSR_API(BaseSrvSoundSentryNotification); @@ -49,6 +48,16 @@ CSR_API(BaseSrvRefreshIniFileMapping); /* nls.c */ +VOID +NTAPI +BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData); + +NTSTATUS +NTAPI +BaseSrvNlsConnect(IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength); + CSR_API(BaseSrvNlsSetUserInfo); CSR_API(BaseSrvNlsSetMultipleUserInfo); CSR_API(BaseSrvNlsCreateSection); Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -61,7 +61,7 @@ BaseSrvNlsUpdateCacheCount, BaseSrvSetTermsrvClientTimeZone, BaseSrvSxsCreateActivationContext, - BaseSrvUnknown, + BaseSrvDebugProcess, BaseSrvRegisterThread, BaseSrvNlsGetUserInfo, }; @@ -96,7 +96,7 @@ TRUE, // BaseSrvNlsUpdateCacheCount TRUE, // BaseSrvSetTermsrvClientTimeZone TRUE, // BaseSrvSxsCreateActivationContext - TRUE, // BaseSrvUnknown + FALSE, // BaseSrvDebugProcess TRUE, // BaseSrvRegisterThread TRUE, // BaseSrvNlsGetUserInfo }; @@ -136,7 +136,7 @@ "BaseNlsUpdateCacheCount", "BaseSetTermsrvClientTimeZone", "BaseSxsCreateActivationContext", - "BaseUnknown", + "BaseSrvDebugProcessStop", "BaseRegisterThread", "BaseNlsGetUserInfo", }; @@ -570,12 +570,37 @@ LoadedServerDll->SharedSection = BaseStaticServerData; } +NTSTATUS +NTAPI +BaseClientConnectRoutine(IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength) +{ + PBASESRV_API_CONNECTINFO ConnectInfo = (PBASESRV_API_CONNECTINFO)ConnectionInfo; + + if ( ConnectionInfo == NULL || + ConnectionInfoLength == NULL || + *ConnectionInfoLength != sizeof(*ConnectInfo) ) + { + DPRINT1("BASESRV: Connection failed - ConnectionInfo = 0x%p ; ConnectionInfoLength = 0x%p (%lu), expected %lu\n", + ConnectionInfo, + ConnectionInfoLength, + ConnectionInfoLength ? *ConnectionInfoLength : (ULONG)-1, + sizeof(*ConnectInfo)); + + return STATUS_INVALID_PARAMETER; + } + + /* Do the NLS connection */ + return BaseSrvNlsConnect(CsrProcess, ConnectionInfo, ConnectionInfoLength); +} + VOID NTAPI -BaseSrvDisconnect(PCSR_PROCESS Process) +BaseClientDisconnectRoutine(IN PCSR_PROCESS CsrProcess) { /* Cleanup the VDM console records */ - BaseSrvCleanupVdmRecords(HandleToUlong(Process->ClientId.UniqueProcess)); + BaseSrvCleanupVdmRecords(HandleToUlong(CsrProcess->ClientId.UniqueProcess)); } CSR_SERVER_DLL_INIT(ServerDllInitialization) @@ -589,8 +614,8 @@ LoadedServerDll->NameTable = BaseServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; - LoadedServerDll->ConnectCallback = NULL; - LoadedServerDll->DisconnectCallback = BaseSrvDisconnect; + LoadedServerDll->ConnectCallback = BaseClientConnectRoutine; + LoadedServerDll->DisconnectCallback = BaseClientDisconnectRoutine; LoadedServerDll->ShutdownProcessCallback = NULL; BaseSrvDllInstance = LoadedServerDll->ServerHandle; Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -108,7 +108,7 @@ } VOID -WINAPI +NTAPI BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData) { /* Initialize the lock */ @@ -128,6 +128,16 @@ /* Get the LCID */ NtQueryDefaultLocale(0, &pNlsRegUserInfo->UserLocaleId); +} + +NTSTATUS +NTAPI +BaseSrvNlsConnect(IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength) +{ + /* Does nothing */ + return STATUS_SUCCESS; } /* PUBLIC SERVER APIS *********************************************************/ Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -18,34 +18,29 @@ CSR_API(BaseSrvDebugProcess) { + /* Deprecated */ + return STATUS_UNSUCCESSFUL; +} + +CSR_API(BaseSrvRegisterThread) +{ DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(BaseSrvRegisterThread) +CSR_API(BaseSrvSxsCreateActivationContext) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(BaseSrvSxsCreateActivationContext) + +CSR_API(BaseSrvSetTermsrvAppInstallMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(BaseSrvSetTermsrvAppInstallMode) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - CSR_API(BaseSrvSetTermsrvClientTimeZone) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - -CSR_API(BaseSrvUnknown) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/subsystems/win/basesrv/sndsntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/snd… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -15,7 +15,7 @@ /* GLOBALS ********************************************************************/ -typedef BOOL (WINAPI *PUSER_SOUND_SENTRY)(VOID); +typedef BOOL (NTAPI *PUSER_SOUND_SENTRY)(VOID); BOOL NTAPI FirstSoundSentry(VOID); static PUSER_SOUND_SENTRY _UserSoundSentry = FirstSoundSentry; Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Tue Dec 16 20:15:35 2014 @@ -420,11 +420,12 @@ ConnectionInfoLength == NULL || *ConnectionInfoLength != sizeof(*ConnectInfo) ) { - DPRINT1("CONSRV: Connection failed - ConnectionInfo = 0x%p ; ConnectionInfoLength = 0x%p (%lu), wanted %lu\n", + DPRINT1("CONSRV: Connection failed - ConnectionInfo = 0x%p ; ConnectionInfoLength = 0x%p (%lu), expected %lu\n", ConnectionInfo, ConnectionInfoLength, ConnectionInfoLength ? *ConnectionInfoLength : (ULONG)-1, sizeof(*ConnectInfo)); + return STATUS_UNSUCCESSFUL; } @@ -500,9 +501,9 @@ VOID NTAPI -ConSrvDisconnect(PCSR_PROCESS Process) -{ - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(Process); +ConSrvDisconnect(IN PCSR_PROCESS CsrProcess) +{ + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); /************************************************************************** * This function is called whenever a new process (GUI or CUI) is destroyed.

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014