[ion] 59872: [BASESRV]: Stubplement all the APIs so that our IDs match with Windows. Windows kernel32 now dies when calling NLSCreateSection.
29 Aug
2013
29 Aug
'13
5 p.m.
Author: ion
Date: Thu Aug 29 17:00:10 2013
New Revision: 59872
URL: http://svn.reactos.org/svn/reactos?rev=59872&view=rev
Log:
[BASESRV]: Stubplement all the APIs so that our IDs match with Windows. Windows kernel32
now dies when calling NLSCreateSection.
Added:
trunk/reactos/subsystems/win/basesrv/nls.c (with props)
Modified:
trunk/reactos/include/reactos/subsys/win/basemsg.h
trunk/reactos/subsystems/win/basesrv/CMakeLists.txt
trunk/reactos/subsystems/win/basesrv/api.h
trunk/reactos/subsystems/win/basesrv/init.c
trunk/reactos/subsystems/win/basesrv/proc.c
trunk/reactos/subsystems/win/basesrv/vdm.c
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] Thu Aug 29 17:00:10
2013
@@ -22,33 +22,32 @@
BasepCreateThread,
BasepGetTempFile,
BasepExitProcess,
- // BasepDebugProcess,
- // BasepCheckVDM,
- // BasepUpdateVDMEntry,
- // BasepGetNextVDMCommand,
- // BasepExitVDM,
- // BasepIsFirstVDM,
- // BasepGetVDMExitCode,
- // BasepSetReenterCount,
+ BasepDebugProcess,
+ BasepCheckVDM,
+ BasepUpdateVDMEntry,
+ BasepGetNextVDMCommand,
+ BasepExitVDM,
+ BasepIsFirstVDM,
+ BasepGetVDMExitCode,
+ BasepSetReenterCount,
BasepSetProcessShutdownParam,
BasepGetProcessShutdownParam,
- // BasepNlsSetUserInfo,
- // BasepNlsSetMultipleUserInfo,
- // BasepNlsCreateSection,
- // BasepSetVDMCurDirs,
- // BasepGetVDMCurDirs,
- // BasepBatNotification,
- // BasepRegisterWowExec,
+ BasepNlsSetUserInfo,
+ BasepNlsSetMultipleUserInfo,
+ BasepNlsCreateSection,
+ BasepSetVDMCurDirs,
+ BasepGetVDMCurDirs,
+ BasepBatNotification,
+ BasepRegisterWowExec,
BasepSoundSentryNotification,
- // BasepRefreshIniFileMapping,
+ BasepRefreshIniFileMapping,
BasepDefineDosDevice,
- // BasepSetTermsrvAppInstallMode,
- // BasepNlsUpdateCacheCount,
- // BasepSetTermsrvClientTimeZone,
- // BasepSxsCreateActivationContext,
- // BasepRegisterThread,
- // BasepNlsGetUserInfo,
-
+ BasepSetTermsrvAppInstallMode,
+ BasepNlsUpdateCacheCount,
+ BasepSetTermsrvClientTimeZone,
+ BasepSxsCreateActivationContext,
+ BasepRegisterThread,
+ BasepNlsGetUserInfo,
BasepMaxApiNumber
} BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
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] Thu Aug 29 17:00:10
2013
@@ -8,6 +8,8 @@
init.c
proc.c
sndsntry.c
+ vdm.c
+ nls.c
basesrv.rc
${CMAKE_CURRENT_BINARY_DIR}/basesrv.def)
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] Thu Aug 29 17:00:10 2013
@@ -21,8 +21,34 @@
CSR_API(BaseSrvExitProcess);
CSR_API(BaseSrvGetProcessShutdownParam);
CSR_API(BaseSrvSetProcessShutdownParam);
+CSR_API(BaseSrvDebugProcess);
+CSR_API(BaseSrvRegisterThread);
+CSR_API(BaseSrvSxsCreateActivationContext);
+CSR_API(BaseSrvSetTermsrvAppInstallMode);
+CSR_API(BaseSrvSetTermsrvClientTimeZone);
/* sndsntry.c */
CSR_API(BaseSrvSoundSentryNotification);
+/* vdm.c */
+CSR_API(BaseSrvCheckVDM);
+CSR_API(BaseSrvUpdateVDMEntry);
+CSR_API(BaseSrvGetNextVDMCommand);
+CSR_API(BaseSrvExitVDM);
+CSR_API(BaseSrvIsFirstVDM);
+CSR_API(BaseSrvGetVDMExitCode);
+CSR_API(BaseSrvSetReenterCount);
+CSR_API(BaseSrvSetVDMCurDirs);
+CSR_API(BaseSrvGetVDMCurDirs);
+CSR_API(BaseSrvBatNotification);
+CSR_API(BaseSrvRegisterWowExec);
+CSR_API(BaseSrvRefreshIniFileMapping);
+
+/* nls.c */
+CSR_API(BaseSrvNlsSetUserInfo);
+CSR_API(BaseSrvNlsSetMultipleUserInfo);
+CSR_API(BaseSrvNlsCreateSection);
+CSR_API(BaseSrvNlsUpdateCacheCount);
+CSR_API(BaseSrvNlsGetUserInfo);
+
/* EOF */
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] Thu Aug 29 17:00:10 2013
@@ -30,32 +30,32 @@
BaseSrvCreateThread,
BaseSrvGetTempFile,
BaseSrvExitProcess,
- // BaseSrvDebugProcess,
- // BaseSrvCheckVDM,
- // BaseSrvUpdateVDMEntry,
- // BaseSrvGetNextVDMCommand,
- // BaseSrvExitVDM,
- // BaseSrvIsFirstVDM,
- // BaseSrvGetVDMExitCode,
- // BaseSrvSetReenterCount,
+ BaseSrvDebugProcess,
+ BaseSrvCheckVDM,
+ BaseSrvUpdateVDMEntry,
+ BaseSrvGetNextVDMCommand,
+ BaseSrvExitVDM,
+ BaseSrvIsFirstVDM,
+ BaseSrvGetVDMExitCode,
+ BaseSrvSetReenterCount,
BaseSrvSetProcessShutdownParam,
BaseSrvGetProcessShutdownParam,
- // BaseSrvNlsSetUserInfo,
- // BaseSrvNlsSetMultipleUserInfo,
- // BaseSrvNlsCreateSection,
- // BaseSrvSetVDMCurDirs,
- // BaseSrvGetVDMCurDirs,
- // BaseSrvBatNotification,
- // BaseSrvRegisterWowExec,
+ BaseSrvNlsSetUserInfo,
+ BaseSrvNlsSetMultipleUserInfo,
+ BaseSrvNlsCreateSection,
+ BaseSrvSetVDMCurDirs,
+ BaseSrvGetVDMCurDirs,
+ BaseSrvBatNotification,
+ BaseSrvRegisterWowExec,
BaseSrvSoundSentryNotification,
- // BaseSrvRefreshIniFileMapping,
+ BaseSrvRefreshIniFileMapping,
BaseSrvDefineDosDevice,
- // BaseSrvSetTermsrvAppInstallMode,
- // BaseSrvNlsUpdateCacheCount,
- // BaseSrvSetTermsrvClientTimeZone,
- // BaseSrvSxsCreateActivationContext,
- // BaseSrvRegisterThread,
- // BaseSrvNlsGetUserInfo,
+ BaseSrvSetTermsrvAppInstallMode,
+ BaseSrvNlsUpdateCacheCount,
+ BaseSrvSetTermsrvClientTimeZone,
+ BaseSrvSxsCreateActivationContext,
+ BaseSrvRegisterThread,
+ BaseSrvNlsGetUserInfo,
};
BOOLEAN BaseServerApiServerValidTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] =
@@ -64,32 +64,32 @@
TRUE, // BaseSrvCreateThread
TRUE, // BaseSrvGetTempFile
FALSE, // BaseSrvExitProcess
- // FALSE, // BaseSrvDebugProcess
- // TRUE, // BaseSrvCheckVDM
- // TRUE, // BaseSrvUpdateVDMEntry
- // TRUE, // BaseSrvGetNextVDMCommand
- // TRUE, // BaseSrvExitVDM
- // TRUE, // BaseSrvIsFirstVDM
- // TRUE, // BaseSrvGetVDMExitCode
- // TRUE, // BaseSrvSetReenterCount
+ FALSE, // BaseSrvDebugProcess
+ TRUE, // BaseSrvCheckVDM
+ TRUE, // BaseSrvUpdateVDMEntry
+ TRUE, // BaseSrvGetNextVDMCommand
+ TRUE, // BaseSrvExitVDM
+ TRUE, // BaseSrvIsFirstVDM
+ TRUE, // BaseSrvGetVDMExitCode
+ TRUE, // BaseSrvSetReenterCount
TRUE, // BaseSrvSetProcessShutdownParam
TRUE, // BaseSrvGetProcessShutdownParam
- // TRUE, // BaseSrvNlsSetUserInfo
- // TRUE, // BaseSrvNlsSetMultipleUserInfo
- // TRUE, // BaseSrvNlsCreateSection
- // TRUE, // BaseSrvSetVDMCurDirs
- // TRUE, // BaseSrvGetVDMCurDirs
- // TRUE, // BaseSrvBatNotification
- // TRUE, // BaseSrvRegisterWowExec
+ TRUE, // BaseSrvNlsSetUserInfo
+ TRUE, // BaseSrvNlsSetMultipleUserInfo
+ TRUE, // BaseSrvNlsCreateSection
+ TRUE, // BaseSrvSetVDMCurDirs
+ TRUE, // BaseSrvGetVDMCurDirs
+ TRUE, // BaseSrvBatNotification
+ TRUE, // BaseSrvRegisterWowExec
TRUE, // BaseSrvSoundSentryNotification
- // TRUE, // BaseSrvRefreshIniFileMapping
+ TRUE, // BaseSrvRefreshIniFileMapping
TRUE, // BaseSrvDefineDosDevice
- // FALSE, // BaseSrvSetTermsrvAppInstallMode
- // FALSE, // BaseSrvNlsUpdateCacheCount
- // FALSE, // BaseSrvSetTermsrvClientTimeZone
- // FALSE, // BaseSrvSxsCreateActivationContext
- // FALSE, // BaseSrvRegisterThread
- // FALSE, // BaseSrvNlsGetUserInfo
+ FALSE, // BaseSrvSetTermsrvAppInstallMode
+ FALSE, // BaseSrvNlsUpdateCacheCount
+ FALSE, // BaseSrvSetTermsrvClientTimeZone
+ FALSE, // BaseSrvSxsCreateActivationContext
+ FALSE, // BaseSrvRegisterThread
+ FALSE, // BaseSrvNlsGetUserInfo
};
PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] =
@@ -98,32 +98,32 @@
"BaseCreateThread",
"BaseGetTempFile",
"BaseExitProcess",
- // "BaseDebugProcess",
- // "BaseCheckVDM",
- // "BaseUpdateVDMEntry",
- // "BaseGetNextVDMCommand",
- // "BaseExitVDM",
- // "BaseIsFirstVDM",
- // "BaseGetVDMExitCode",
- // "BaseSetReenterCount",
+ "BaseDebugProcess",
+ "BaseCheckVDM",
+ "BaseUpdateVDMEntry",
+ "BaseGetNextVDMCommand",
+ "BaseExitVDM",
+ "BaseIsFirstVDM",
+ "BaseGetVDMExitCode",
+ "BaseSetReenterCount",
"BaseSetProcessShutdownParam",
"BaseGetProcessShutdownParam",
- // "BaseNlsSetUserInfo",
- // "BaseNlsSetMultipleUserInfo",
- // "BaseNlsCreateSection",
- // "BaseSetVDMCurDirs",
- // "BaseGetVDMCurDirs",
- // "BaseBatNotification",
- // "BaseRegisterWowExec",
+ "BaseNlsSetUserInfo",
+ "BaseNlsSetMultipleUserInfo",
+ "BaseNlsCreateSection",
+ "BaseSetVDMCurDirs",
+ "BaseGetVDMCurDirs",
+ "BaseBatNotification",
+ "BaseRegisterWowExec",
"BaseSoundSentryNotification",
- // "BaseRefreshIniFileMapping",
+ "BaseRefreshIniFileMapping",
"BaseDefineDosDevice",
- // "BaseSetTermsrvAppInstallMode",
- // "BaseNlsUpdateCacheCount",
- // "BaseSetTermsrvClientTimeZone",
- // "BaseSxsCreateActivationContext",
- // "BaseRegisterThread",
- // "BaseNlsGetUserInfo",
+ "BaseSetTermsrvAppInstallMode",
+ "BaseNlsUpdateCacheCount",
+ "BaseSetTermsrvClientTimeZone",
+ "BaseSxsCreateActivationContext",
+ "BaseRegisterThread",
+ "BaseNlsGetUserInfo",
};
Added: 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 (added)
+++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Thu Aug 29 17:00:10 2013
@@ -0,0 +1,49 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Base API Server DLL
+ * FILE: subsystems/win/basesrv/vdm.c
+ * PURPOSE: Virtual DOS Machines (VDM) Support
+ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)
+ */
+
+/* INCLUDES *******************************************************************/
+
+#include "basesrv.h"
+
+#define NDEBUG
+#include <debug.h>
+
+/* PUBLIC SERVER APIS *********************************************************/
+
+CSR_API(BaseSrvNlsSetUserInfo)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvNlsSetMultipleUserInfo)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvNlsCreateSection)
+
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvNlsUpdateCacheCount)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvNlsGetUserInfo)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+/* EOF */
Propchange: trunk/reactos/subsystems/win/basesrv/nls.c
------------------------------------------------------------------------------
svn:eol-style = native
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] Thu Aug 29 17:00:10 2013
@@ -14,6 +14,35 @@
#include <debug.h>
/* PUBLIC SERVER APIS *********************************************************/
+
+CSR_API(BaseSrvDebugProcess)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvRegisterThread)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+CSR_API(BaseSrvSxsCreateActivationContext)
+{
+ 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(BaseSrvGetTempFile)
{
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] Thu Aug 29 17:00:10 2013
@@ -13,4 +13,78 @@
#define NDEBUG
#include <debug.h>
+/* PUBLIC SERVER APIS *********************************************************/
+
+CSR_API(BaseSrvCheckVDM)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvUpdateVDMEntry)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvGetNextVDMCommand)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvExitVDM)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvIsFirstVDM)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvGetVDMExitCode)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvSetReenterCount)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvSetVDMCurDirs)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvGetVDMCurDirs)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvBatNotification)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvRegisterWowExec)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+CSR_API(BaseSrvRefreshIniFileMapping)
+{
+ DPRINT1("%s not yet implemented\n", __FUNCTION__);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
/* EOF */
4039
days inactive
4039
days old
0 comments
1 participants
participants (1)
-
ion＠svn.reactos.org