Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 10:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL/CSR/SM]

Browse source 
- Clean some headers.
- Code formatting.

svn path=/branches/ros-csrss/; revision=57643
This commit is contained in:
Hermès Bélusca-Maïto 2012-10-28 22:56:13 +00:00
parent c269edc831
commit e5f19654e3
7 changed files with 26 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/ntdll/include/ntdll.h
View file

@ -41,7 +41,8 @@
/* Internal NTDLL */ /* Internal NTDLL */
#include "ntdllp.h" #include "ntdllp.h"
/* CSRSS Header */ /* CSRSS Headers */
#include <csr/csrsrv.h>
#include <csr/csr.h> #include <csr/csr.h>
/* PSEH */ /* PSEH */

12
include/reactos/subsys/csr/csrmsg.h
View file

@ -97,9 +97,6 @@ typedef struct _CSR_CAPTURE_BUFFER
ULONG_PTR PointerArray[1]; ULONG_PTR PointerArray[1];
} CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER;
#include "csrss.h" // remove it when the data structures are not used anymore.
/* Keep in sync with definition below. */ /* Keep in sync with definition below. */
// #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) // #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS))
@ -118,17 +115,8 @@ typedef struct _CSR_API_MESSAGE
union union
{ {
CSR_CLIENT_CONNECT CsrClientConnect; CSR_CLIENT_CONNECT CsrClientConnect;
CSR_SET_PRIORITY_CLASS SetPriorityClass; CSR_SET_PRIORITY_CLASS SetPriorityClass;
CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
/*** win32csr thingies to remove. ***/
#if 1
CSRSS_CREATE_DESKTOP CreateDesktopRequest;
CSRSS_SHOW_DESKTOP ShowDesktopRequest;
CSRSS_HIDE_DESKTOP HideDesktopRequest;
#endif
/************************************/
} Data; } Data;
}; };
}; };

3
include/reactos/subsys/csr/csrsrv.h
View file

@ -23,6 +23,9 @@
/* TYPES **********************************************************************/ /* TYPES **********************************************************************/
// Used in ntdll/csr/connect.c
#define CSR_CSRSS_SECTION_SIZE (65536)
typedef struct _CSR_NT_SESSION typedef struct _CSR_NT_SESSION
{ {
ULONG ReferenceCount; ULONG ReferenceCount;

33
include/reactos/subsys/csr/csrss.h
View file

@ -1,33 +0,0 @@
/***************************** CSRSS Data ***********************************/
#ifndef __INCLUDE_CSRSS_CSRSS_H
#define __INCLUDE_CSRSS_CSRSS_H
// Used in ntdll/csr/connect.c
#define CSR_CSRSS_SECTION_SIZE (65536)
/*** win32csr thingies to remove. ***/
#if 1
typedef struct
{
HDESK DesktopHandle;
} CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP;
typedef struct
{
HWND DesktopWindow;
ULONG Width;
ULONG Height;
} CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP;
typedef struct
{
HWND DesktopWindow;
} CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP;
#endif
/************************************/
#endif /* __INCLUDE_CSRSS_CSRSS_H */

41
include/reactos/subsys/sm/helper.h
View file

@ -5,36 +5,33 @@
#include <sm/api.h> #include <sm/api.h>
#endif #endif
/* $Id$ */
/* smlib/connect.c */ /* smlib/connect.c */
NTSTATUS WINAPI NTSTATUS WINAPI
SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, SmConnectApiPort(IN PUNICODE_STRING pSbApiPortName OPTIONAL,
IN HANDLE hSbApiPort OPTIONAL, IN HANDLE hSbApiPort OPTIONAL,
IN WORD wSubsystem OPTIONAL, /* pe.h */ IN WORD wSubsystem OPTIONAL, /* pe.h */
IN OUT PHANDLE phSmApiPort); IN OUT PHANDLE phSmApiPort);
/* smlib/compses.c */ /* smlib/compses.c */
NTSTATUS WINAPI NTSTATUS WINAPI
SmCompleteSession (IN HANDLE hSmApiPort, SmCompleteSession(IN HANDLE hSmApiPort,
IN HANDLE hSbApiPort, IN HANDLE hSbApiPort,
IN HANDLE hApiPort); IN HANDLE hApiPort);
/* smlib/execpgm.c */ /* smlib/execpgm.c */
NTSTATUS WINAPI NTSTATUS WINAPI
SmExecuteProgram (IN HANDLE hSmApiPort, SmExecuteProgram(IN HANDLE hSmApiPort,
IN PUNICODE_STRING Pgm IN PUNICODE_STRING Pgm);
);
/* smdll/query.c */ /* smdll/query.c */
NTSTATUS WINAPI NTSTATUS WINAPI
SmQueryInformation (IN HANDLE SmApiPort, SmQueryInformation(IN HANDLE SmApiPort,
IN SM_INFORMATION_CLASS SmInformationClass, IN SM_INFORMATION_CLASS SmInformationClass,
IN OUT PVOID Data, IN OUT PVOID Data,
IN ULONG DataLength, IN ULONG DataLength,
IN OUT PULONG ReturnedDataLength OPTIONAL); IN OUT PULONG ReturnedDataLength OPTIONAL);
/* smlib/lookupss.c */ /* smlib/lookupss.c */
NTSTATUS WINAPI NTSTATUS WINAPI
SmLookupSubsystem (IN PWSTR Name, SmLookupSubsystem(IN PWSTR Name,
IN OUT PWSTR Data, IN OUT PWSTR Data,
IN OUT PULONG DataLength, IN OUT PULONG DataLength,
IN OUT PULONG DataType, IN OUT PULONG DataType,
IN PVOID Environment OPTIONAL); IN PVOID Environment OPTIONAL);
#endif /* ndef INCLUDE_SM_HELPER_H */ #endif /* ndef INCLUDE_SM_HELPER_H */

4
include/reactos/subsys/sm/ns.h
View file

@ -1,9 +1,7 @@
#if !defined(INCLUDE_SM_NS_H) #if !defined(INCLUDE_SM_NS_H)
#define INCLUDE_SM_NS_H #define INCLUDE_SM_NS_H
/* $Id$ */ #define SM_REGISTRY_ROOT_NAME L"\\Session Manager"
#define SM_REGISTRY_ROOT_NAME L"\\Session Manager"
#define SM_REGISTRY_SUBSYSTEMS_NAME L"SubSystems" #define SM_REGISTRY_SUBSYSTEMS_NAME L"SubSystems"
#define SM_API_PORT_NAME L"\\SmApiPort" #define SM_API_PORT_NAME L"\\SmApiPort"

2
include/reactos/subsys/win/base.h
View file

@ -13,7 +13,7 @@
typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID);
NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); NTSTATUS WINAPI BaseSetProcessCreateNotify(BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
// CSR_SERVER_DLL_INIT(ServerDllInitialization); // CSR_SERVER_DLL_INIT(ServerDllInitialization);
typedef struct _NLS_USER_INFO typedef struct _NLS_USER_INFO