Author: hbelusca
Date: Fri Aug 30 11:33:25 2013
New Revision: 59900
URL:
http://svn.reactos.org/svn/reactos?rev=59900&view=rev
Log:
[USERSRV]: Stubplement all the APIs needed for Windows kernel32.
Modified:
trunk/reactos/include/reactos/subsys/win/winmsg.h
trunk/reactos/win32ss/user/winsrv/usersrv/api.h
trunk/reactos/win32ss/user/winsrv/usersrv/init.c
trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win…
==============================================================================
--- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Fri Aug 30 11:33:25
2013
@@ -19,15 +19,15 @@
typedef enum _USERSRV_API_NUMBER
{
UserpExitWindowsEx = USERSRV_FIRST_API_NUMBER,
- // UserpEndTask,
- // UserpLogon,
+ UserpEndTask,
+ UserpLogon,
UserpRegisterServicesProcess, // Not present in Win7
- // UserpActivateDebugger,
- // UserpGetThreadConsoleDesktop, // Not present in Win7
- // UserpDeviceEvent,
+ UserpActivateDebugger,
+ UserpGetThreadConsoleDesktop, // Not present in Win7
+ UserpDeviceEvent,
UserpRegisterLogonProcess, // Not present in Win7
- // UserpCreateSystemThreads,
- // UserpRecordShutdownReason,
+ UserpCreateSystemThreads,
+ UserpRecordShutdownReason,
// UserpCancelShutdown, // Added in Vista
// UserpConsoleHandleOperation, // Added in Win7
// UserpGetSetShutdownBlockReason, // Added in Vista
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] Fri Aug 30 11:33:25 2013
@@ -10,6 +10,10 @@
/* init.c */
BOOL WINAPI _UserSoundSentry(VOID);
+CSR_API(SrvCreateSystemThreads);
+CSR_API(SrvActivateDebugger);
+CSR_API(SrvGetThreadConsoleDesktop);
+CSR_API(SrvDeviceEvent);
/* harderror.c */
VOID WINAPI UserServerHardError(IN PCSR_THREAD ThreadData,
@@ -21,5 +25,8 @@
/* shutdown.c */
CSR_API(SrvExitWindowsEx);
+CSR_API(SrvEndTask);
+CSR_API(SrvLogon);
+CSR_API(SrvRecordShutdownReason);
/* EOF */
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Fri Aug 30 11:33:25
2013
@@ -26,15 +26,15 @@
PCSR_API_ROUTINE UserServerApiDispatchTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER]
=
{
SrvExitWindowsEx,
- // SrvEndTask,
- // SrvLogon,
+ SrvEndTask,
+ SrvLogon,
SrvRegisterServicesProcess, // Not present in Win7
- // SrvActivateDebugger,
- // SrvGetThreadConsoleDesktop, // Not present in Win7
- // SrvDeviceEvent,
+ SrvActivateDebugger,
+ SrvGetThreadConsoleDesktop, // Not present in Win7
+ SrvDeviceEvent,
SrvRegisterLogonProcess, // Not present in Win7
- // SrvCreateSystemThreads,
- // SrvRecordShutdownReason,
+ SrvCreateSystemThreads,
+ SrvRecordShutdownReason,
// SrvCancelShutdown, // Added in Vista
// SrvConsoleHandleOperation, // Added in Win7
// SrvGetSetShutdownBlockReason, // Added in Vista
@@ -43,15 +43,15 @@
BOOLEAN UserServerApiServerValidTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] =
{
FALSE, // SrvExitWindowsEx
- // FALSE, // SrvEndTask
- // FALSE, // SrvLogon
+ FALSE, // SrvEndTask
+ FALSE, // SrvLogon
FALSE, // SrvRegisterServicesProcess
- // FALSE, // SrvActivateDebugger
- // TRUE, // SrvGetThreadConsoleDesktop
- // FALSE, // SrvDeviceEvent
+ FALSE, // SrvActivateDebugger
+ TRUE, // SrvGetThreadConsoleDesktop
+ FALSE, // SrvDeviceEvent
FALSE, // SrvRegisterLogonProcess
- // FALSE, // SrvCreateSystemThreads
- // FALSE, // SrvRecordShutdownReason
+ FALSE, // SrvCreateSystemThreads
+ FALSE, // SrvRecordShutdownReason
// FALSE, // SrvCancelShutdown
// FALSE, // SrvConsoleHandleOperation
// FALSE, // SrvGetSetShutdownBlockReason
@@ -60,15 +60,15 @@
PCHAR UserServerApiNameTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] =
{
"SrvExitWindowsEx",
- // "SrvEndTask",
- // "SrvLogon",
+ "SrvEndTask",
+ "SrvLogon",
"SrvRegisterServicesProcess",
- // "SrvActivateDebugger",
- // "SrvGetThreadConsoleDesktop",
- // "SrvDeviceEvent",
+ "SrvActivateDebugger",
+ "SrvGetThreadConsoleDesktop",
+ "SrvDeviceEvent",
"SrvRegisterLogonProcess",
- // "SrvCreateSystemThreads",
- // "SrvRecordShutdownReason",
+ "SrvCreateSystemThreads",
+ "SrvRecordShutdownReason",
// "SrvCancelShutdown",
// "SrvConsoleHandleOperation",
// "SrvGetSetShutdownBlockReason",
@@ -236,13 +236,37 @@
NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK);
}
-DWORD
-WINAPI
+ULONG
+NTAPI
CreateSystemThreads(PVOID pParam)
{
NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS);
DPRINT1("This thread should not terminate!\n");
return 0;
+}
+
+CSR_API(SrvCreateSystemThreads)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(SrvActivateDebugger)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(SrvGetThreadConsoleDesktop)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(SrvDeviceEvent)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
}
CSR_SERVER_DLL_INIT(UserServerDllInitialization)
@@ -280,7 +304,10 @@
/* Start the Raw Input Thread and the Desktop Thread */
for (i = 0; i < 2; ++i)
{
- Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0,
(PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId);
+ Status = RtlCreateUserThread(NtCurrentProcess(),
+ NULL, TRUE, 0, 0, 0,
+ CreateSystemThreads,
+ (PVOID)i, &ServerThread, &ClientId);
if (NT_SUCCESS(Status))
{
NtResumeThread(ServerThread, NULL);
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Fri Aug 30 11:33:25
2013
@@ -931,4 +931,22 @@
}
}
+CSR_API(SrvEndTask)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(SrvLogon)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(SrvRecordShutdownReason)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
/* EOF */