[KERNEL32]

Use some existing #define'd constants.

[CSRSRV-BASESRV]
- Add CSR version define (based from BASESRV version define).
- Add missing BASESRV structures, taken from https://code.google.com/p/ontl/source/browse/branches/devel/ntl/nt/csr.hxx (OpenNT Native Template Library).

svn path=/trunk/; revision=59779

diff --git a/reactos/dll/ntdll/csr/connect.c b/reactos/dll/ntdll/csr/connect.c
index a7bf85a..163eecb 100644 (file)
--- a/reactos/dll/ntdll/csr/connect.c
+++ b/reactos/dll/ntdll/csr/connect.c
@@ -107,7 +107,7 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory)
     SecurityQos.EffectiveOnly = TRUE;
 
     /* Setup the connection info */
     SecurityQos.EffectiveOnly = TRUE;
 
     /* Setup the connection info */

-    ConnectionInfo.Version = 0x10000;
+    ConnectionInfo.Version = CSRSRV_VERSION;

 
     /* Create a SID for us */
     Status = RtlAllocateAndInitializeSid(&NtSidAuthority,
 
     /* Create a SID for us */
     Status = RtlAllocateAndInitializeSid(&NtSidAuthority,

diff --git a/reactos/dll/win32/kernel32/client/dosdev.c b/reactos/dll/win32/kernel32/client/dosdev.c
index bf6c991..a7a7aba 100644 (file)
--- a/reactos/dll/win32/kernel32/client/dosdev.c
+++ b/reactos/dll/win32/kernel32/client/dosdev.c
@@ -157,7 +157,7 @@ DefineDosDeviceW(
     }
     else
     {
     }
     else
     {

-        DefineDosDeviceRequest->dwFlags = dwFlags;
+        DefineDosDeviceRequest->Flags = dwFlags;

 
         CsrCaptureMessageBuffer(CaptureBuffer,
                                 (PVOID)DeviceUpcaseNameU.Buffer,
 
         CsrCaptureMessageBuffer(CaptureBuffer,
                                 (PVOID)DeviceUpcaseNameU.Buffer,


@@ -174,11 +174,11 @@ DefineDosDeviceW(
             CsrCaptureMessageBuffer(CaptureBuffer,
                                     (PVOID)NtTargetPathU.Buffer,
                                     NtTargetPathU.Length,
             CsrCaptureMessageBuffer(CaptureBuffer,
                                     (PVOID)NtTargetPathU.Buffer,
                                     NtTargetPathU.Length,

-                                    (PVOID*)&DefineDosDeviceRequest->TargetName.Buffer);
+                                    (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer);

         }
         }

-        DefineDosDeviceRequest->TargetName.Length =
+        DefineDosDeviceRequest->TargetPath.Length =

             NtTargetPathU.Length;
             NtTargetPathU.Length;

-        DefineDosDeviceRequest->TargetName.MaximumLength =
+        DefineDosDeviceRequest->TargetPath.MaximumLength =

             NtTargetPathU.Length;
 
         Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
             NtTargetPathU.Length;
 
         Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,

diff --git a/reactos/dll/win32/kernel32/client/file/filename.c b/reactos/dll/win32/kernel32/client/file/filename.c
index 0fe7449..cf13a5c 100644 (file)
--- a/reactos/dll/win32/kernel32/client/file/filename.c
+++ b/reactos/dll/win32/kernel32/client/file/filename.c
@@ -92,7 +92,7 @@ GetTempFileNameW(IN LPCWSTR lpPathName,
     CHAR IDString[5];
     WCHAR * TempFileName;
     BASE_API_MESSAGE ApiMessage;
     CHAR IDString[5];
     WCHAR * TempFileName;
     BASE_API_MESSAGE ApiMessage;

-    PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFile;
+    PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFileRequest;

     DWORD FileAttributes, LastError;
     UNICODE_STRING PathNameString, PrefixString;
     static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL };
     DWORD FileAttributes, LastError;
     UNICODE_STRING PathNameString, PrefixString;
     static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL };

diff --git a/reactos/dll/win32/kernel32/client/proc.c b/reactos/dll/win32/kernel32/client/proc.c
index bb2bda4..7c015d2 100644 (file)
--- a/reactos/dll/win32/kernel32/client/proc.c
+++ b/reactos/dll/win32/kernel32/client/proc.c
@@ -963,13 +963,13 @@ GetProcessShutdownParameters(OUT LPDWORD lpdwLevel,
 {
     NTSTATUS Status;
     BASE_API_MESSAGE ApiMessage;
 {
     NTSTATUS Status;
     BASE_API_MESSAGE ApiMessage;

-    PBASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest = &ApiMessage.Data.GetShutdownParametersRequest;
+    PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &ApiMessage.Data.ShutdownParametersRequest;

 
     /* Ask CSRSS for shutdown information */
     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetProcessShutdownParam),
 
     /* Ask CSRSS for shutdown information */
     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetProcessShutdownParam),

-                                 sizeof(BASE_GET_PROCESS_SHUTDOWN_PARAMS));
+                                 sizeof(BASE_GETSET_PROCESS_SHUTDOWN_PARAMS));

     if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */
     if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */


@@ -978,8 +978,8 @@ GetProcessShutdownParameters(OUT LPDWORD lpdwLevel,
     }
 
     /* Get the data back */
     }
 
     /* Get the data back */

-    *lpdwLevel = GetShutdownParametersRequest->Level;
-    *lpdwFlags = GetShutdownParametersRequest->Flags;
+    *lpdwLevel = ShutdownParametersRequest->ShutdownLevel;
+    *lpdwFlags = ShutdownParametersRequest->ShutdownFlags;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -993,15 +993,15 @@ SetProcessShutdownParameters(IN DWORD dwLevel,
 {
     NTSTATUS Status;
     BASE_API_MESSAGE ApiMessage;
 {
     NTSTATUS Status;
     BASE_API_MESSAGE ApiMessage;

-    PBASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest = &ApiMessage.Data.SetShutdownParametersRequest;
+    PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &ApiMessage.Data.ShutdownParametersRequest;

 
     /* Write the data into the CSRSS request and send it */
 
     /* Write the data into the CSRSS request and send it */

-    SetShutdownParametersRequest->Level = dwLevel;
-    SetShutdownParametersRequest->Flags = dwFlags;
+    ShutdownParametersRequest->ShutdownLevel = dwLevel;
+    ShutdownParametersRequest->ShutdownFlags = dwFlags;

     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetProcessShutdownParam),
     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetProcessShutdownParam),

-                                 sizeof(BASE_SET_PROCESS_SHUTDOWN_PARAMS));
+                                 sizeof(BASE_GETSET_PROCESS_SHUTDOWN_PARAMS));

     if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */
     if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */


@@ -2426,7 +2426,7 @@ CreateProcessInternalW(IN HANDLE hUserToken,
 
     /* Set message structures */
     CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest;
 
     /* Set message structures */
     CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest;

-    VdmMsg = &CsrMsg.Data.CheckVdm;
+    VdmMsg = &CsrMsg.Data.CheckVDMRequest;

 
     /* Clear the more complex structures by zeroing out their entire memory */
     RtlZeroMemory(&Context, sizeof(Context));
 
     /* Clear the more complex structures by zeroing out their entire memory */
     RtlZeroMemory(&Context, sizeof(Context));

diff --git a/reactos/dll/win32/kernel32/client/vdm.c b/reactos/dll/win32/kernel32/client/vdm.c
index 69a7010..11528b0 100644 (file)
--- a/reactos/dll/win32/kernel32/client/vdm.c
+++ b/reactos/dll/win32/kernel32/client/vdm.c
@@ -2,7 +2,7 @@
  * PROJECT:         ReactOS Win32 Base API
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/win32/kernel32/client/vdm.c
  * PROJECT:         ReactOS Win32 Base API
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/win32/kernel32/client/vdm.c

- * PURPOSE:         Virtual Dos Machine (VDM) Support
+ * PURPOSE:         Virtual DOS Machines (VDM) Support

  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 


@@ -49,17 +49,18 @@ BaseIsDosApplication(IN PUNICODE_STRING PathName,
     /* Is it a .com? */
     String.Length = BaseDotComSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];
     /* Is it a .com? */
     String.Length = BaseDotComSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];

-    if (RtlEqualUnicodeString(&String, &BaseDotComSuffixName, TRUE)) return 2;
+    if (RtlEqualUnicodeString(&String, &BaseDotComSuffixName, TRUE)) return BINARY_TYPE_COM;

 
     /* Is it a .pif? */
     String.Length = BaseDotPifSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];
 
     /* Is it a .pif? */
     String.Length = BaseDotPifSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];

-    if (RtlEqualUnicodeString(&String, &BaseDotPifSuffixName, TRUE)) return 3;
+    if (RtlEqualUnicodeString(&String, &BaseDotPifSuffixName, TRUE)) return BINARY_TYPE_PIF;

 
     /* Is it an exe? */
     String.Length = BaseDotExeSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];
 
     /* Is it an exe? */
     String.Length = BaseDotExeSuffixName.Length;
     String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)];

-    if (RtlEqualUnicodeString(&String, &BaseDotExeSuffixName, TRUE)) return 1;
+    if (RtlEqualUnicodeString(&String, &BaseDotExeSuffixName, TRUE)) return BINARY_TYPE_EXE;
+

     return 0;
 }
 
     return 0;
 }
 

diff --git a/reactos/include/reactos/subsys/csr/csrmsg.h b/reactos/include/reactos/subsys/csr/csrmsg.h
index b750aff..a7d08cf 100644 (file)
--- a/reactos/include/reactos/subsys/csr/csrmsg.h
+++ b/reactos/include/reactos/subsys/csr/csrmsg.h
@@ -32,13 +32,6 @@ typedef enum _CSRSRV_API_NUMBER
 } CSRSRV_API_NUMBER, *PCSRSRV_API_NUMBER;
 
 
 } CSRSRV_API_NUMBER, *PCSRSRV_API_NUMBER;
 
 

-/*
-typedef struct _CSR_API_NUMBER
-{
-    WORD Index;
-    WORD Subsystem;
-} CSR_API_NUMBER, *PCSR_API_NUMBER;
-*/

 typedef ULONG CSR_API_NUMBER;
 
 #define CSR_CREATE_API_NUMBER(ServerId, ApiId) \
 typedef ULONG CSR_API_NUMBER;
 
 #define CSR_CREATE_API_NUMBER(ServerId, ApiId) \


@@ -64,6 +57,8 @@ typedef struct _CSR_CONNECTION_INFO
     HANDLE ProcessId;
 } CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO;
 
     HANDLE ProcessId;
 } CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO;
 

+#define CSRSRV_VERSION 0x10000
+

 // We must have a size at most equal to the maximum acceptable LPC data size.
 C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH);
 
 // We must have a size at most equal to the maximum acceptable LPC data size.
 C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH);
 

diff --git a/reactos/include/reactos/subsys/win/basemsg.h b/reactos/include/reactos/subsys/win/basemsg.h
index 8875744..8f4c5e4 100644 (file)
--- a/reactos/include/reactos/subsys/win/basemsg.h
+++ b/reactos/include/reactos/subsys/win/basemsg.h
@@ -52,6 +52,21 @@ typedef enum _BASESRV_API_NUMBER
     BasepMaxApiNumber
 } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
 
     BasepMaxApiNumber
 } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER;
 

+
+typedef struct
+{
+    ULONG  ExpectedVersion;
+    HANDLE DefaultObjectDirectory;
+    ULONG  WindowsVersion;
+    ULONG  CurrentVersion;
+    ULONG  DebugFlags;
+    WCHAR  WindowsDirectory[MAX_PATH];
+    WCHAR  WindowsSystemDirectory[MAX_PATH];
+} BASESRV_API_CONNECTINFO, *PBASESRV_API_CONNECTINFO;
+
+#define BASESRV_VERSION 0x10000
+
+

 typedef struct _BASE_SXS_CREATEPROCESS_MSG
 {
     ULONG Flags;
 typedef struct _BASE_SXS_CREATEPROCESS_MSG
 {
     ULONG Flags;


@@ -96,38 +111,38 @@ typedef struct
 
 typedef struct
 {
 
 typedef struct
 {

-    UINT uExitCode;
-} BASE_EXIT_PROCESS, *PBASE_EXIT_PROCESS;
+    UINT UniqueID;
+} BASE_GET_TEMP_FILE, *PBASE_GET_TEMP_FILE;

 
 typedef struct
 {
 
 typedef struct
 {

-    UINT UniqueID;
-} BASE_GET_TEMP_FILE, *PBASE_GET_TEMP_FILE;
+    UINT uExitCode;
+} BASE_EXIT_PROCESS, *PBASE_EXIT_PROCESS;

 
 typedef struct
 {
 
 typedef struct
 {

-    ULONG iTask;
+    ULONG  iTask;

     HANDLE ConsoleHandle;
     HANDLE ConsoleHandle;

-    ULONG BinaryType;
+    ULONG  BinaryType;

     HANDLE WaitObjectForParent;
     HANDLE StdIn;
     HANDLE StdOut;
     HANDLE StdErr;
     HANDLE WaitObjectForParent;
     HANDLE StdIn;
     HANDLE StdOut;
     HANDLE StdErr;

-    ULONG CodePage;
-    ULONG dwCreationFlags;
-    PCHAR CmdLine;
-    PCHAR appName;
-    PCHAR PifFile;
-    PCHAR CurDirectory;
-    PCHAR Env;
-    ULONG EnvLen;
-    PVOID StartupInfo;
-    PCHAR Desktop;
-    ULONG DesktopLen;
-    PCHAR Title;
-    ULONG TitleLen;
-    PCHAR Reserved;
-    ULONG ReservedLen;
+    ULONG  CodePage;
+    ULONG  dwCreationFlags;
+    PCHAR  CmdLine;
+    PCHAR  appName;
+    PCHAR  PifFile;
+    PCHAR  CurDirectory;
+    PCHAR  Env;
+    ULONG  EnvLen;
+    LPSTARTUPINFOA StartupInfo;
+    PCHAR  Desktop;
+    ULONG  DesktopLen;
+    PCHAR  Title;
+    ULONG  TitleLen;
+    PCHAR  Reserved;
+    ULONG  ReservedLen;

     USHORT CmdLen;
     USHORT AppLen;
     USHORT PifLen;
     USHORT CmdLen;
     USHORT AppLen;
     USHORT PifLen;


@@ -138,8 +153,8 @@ typedef struct
 
 typedef struct
 {
 
 typedef struct
 {

-    ULONG iTask;
-    ULONG BinaryType;
+    ULONG  iTask;
+    ULONG  BinaryType;

     HANDLE ConsoleHandle;
     HANDLE VDMProcessHandle;
     HANDLE WaitObjectForParent;
     HANDLE ConsoleHandle;
     HANDLE VDMProcessHandle;
     HANDLE WaitObjectForParent;


@@ -147,24 +162,87 @@ typedef struct
     USHORT VDMCreationState;
 } BASE_UPDATE_VDM_ENTRY, *PBASE_UPDATE_VDM_ENTRY;
 
     USHORT VDMCreationState;
 } BASE_UPDATE_VDM_ENTRY, *PBASE_UPDATE_VDM_ENTRY;
 

+typedef struct
+{
+    ULONG  iTask;
+    HANDLE ConsoleHandle;
+    HANDLE WaitObjectForVDM;
+    HANDLE StdIn;
+    HANDLE StdOut;
+    HANDLE StdErr;
+    ULONG  CodePage;
+    ULONG  dwCreationFlags;
+    ULONG  ExitCode;
+    PCHAR  CmdLine;
+    PCHAR  AppName;
+    PCHAR  PifFile;
+    PCHAR  CurDirectory;
+    PCHAR  Env;
+    ULONG  EnvLen;
+    LPSTARTUPINFOA StartupInfo;
+    PCHAR  Desktop;
+    ULONG  DesktopLen;
+    PCHAR  Title;
+    ULONG  TitleLen;
+    PCHAR  Reserved;
+    ULONG  ReservedLen;
+    USHORT CurrentDrive;
+    USHORT CmdLen;
+    USHORT AppLen;
+    USHORT PifLen;
+    USHORT CurDirectoryLen;
+    USHORT VDMState;
+    ULONG  fComingFromBat;
+} BASE_GET_NEXT_VDM_COMMAND, *PBASE_GET_NEXT_VDM_COMMAND;
+
+typedef struct
+{
+    HANDLE ConsoleHandle;
+    ULONG  iWowTask;
+    HANDLE WaitObjectForVDM;
+} BASE_EXIT_VDM, *PBASE_EXIT_VDM;
+
+typedef struct
+{
+    ULONG FirstVDM;
+} BASE_IS_FIRST_VDM, *PBASE_IS_FIRST_VDM;
+

 typedef struct
 {
     HANDLE ConsoleHandle;
     HANDLE hParent;
 typedef struct
 {
     HANDLE ConsoleHandle;
     HANDLE hParent;

-    ULONG ExitCode;
+    ULONG  ExitCode;

 } BASE_GET_VDM_EXIT_CODE, *PBASE_GET_VDM_EXIT_CODE;
 
 typedef struct
 {
 } BASE_GET_VDM_EXIT_CODE, *PBASE_GET_VDM_EXIT_CODE;
 
 typedef struct
 {

-    DWORD Level;
-    DWORD Flags;
-} BASE_SET_PROCESS_SHUTDOWN_PARAMS, *PBASE_SET_PROCESS_SHUTDOWN_PARAMS;
+    HANDLE ConsoleHandle;
+    ULONG  fIncDec;
+} BASE_SET_REENTER_COUNT, *PBASE_SET_REENTER_COUNT;
+
+typedef struct
+{
+    ULONG ShutdownLevel;
+    ULONG ShutdownFlags;
+} BASE_GETSET_PROCESS_SHUTDOWN_PARAMS, *PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS;

 
 typedef struct
 {
 
 typedef struct
 {

-    DWORD Level;
-    DWORD Flags;
-} BASE_GET_PROCESS_SHUTDOWN_PARAMS, *PBASE_GET_PROCESS_SHUTDOWN_PARAMS;
+    HANDLE ConsoleHandle;
+    PCHAR  lpszzCurDirs;
+    ULONG  cchCurDirs;
+} BASE_GETSET_VDM_CURDIRS, *PBASE_GETSET_VDM_CURDIRS;
+
+typedef struct
+{
+    HANDLE ConsoleHandle;
+    ULONG  fBeginEnd;
+} BASE_BAT_NOTIFICATION, *PBASE_BAT_NOTIFICATION;
+
+typedef struct
+{
+    HANDLE hwndWowExec;
+} BASE_REGISTER_WOWEXEC, *PBASE_REGISTER_WOWEXEC;

 
 typedef struct
 {
 
 typedef struct
 {


@@ -173,9 +251,14 @@ typedef struct
 
 typedef struct
 {
 
 typedef struct
 {

+    UNICODE_STRING IniFileName;
+} BASE_REFRESH_INIFILE_MAPPING, *PBASE_REFRESH_INIFILE_MAPPING;
+
+typedef struct
+{
+    ULONG Flags;

     UNICODE_STRING DeviceName;
     UNICODE_STRING DeviceName;

-    UNICODE_STRING TargetName;
-    DWORD dwFlags;
+    UNICODE_STRING TargetPath;

 } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE;
 
 typedef struct _BASE_API_MESSAGE
 } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE;
 
 typedef struct _BASE_API_MESSAGE


@@ -190,14 +273,21 @@ typedef struct _BASE_API_MESSAGE
     {
         BASE_CREATE_PROCESS CreateProcessRequest;
         BASE_CREATE_THREAD CreateThreadRequest;
     {
         BASE_CREATE_PROCESS CreateProcessRequest;
         BASE_CREATE_THREAD CreateThreadRequest;

+        BASE_GET_TEMP_FILE GetTempFileRequest;

         BASE_EXIT_PROCESS ExitProcessRequest;
         BASE_EXIT_PROCESS ExitProcessRequest;

-        BASE_GET_TEMP_FILE GetTempFile;
-        BASE_CHECK_VDM CheckVdm;
-        BASE_UPDATE_VDM_ENTRY UpdateVdmEntry;
-        BASE_GET_VDM_EXIT_CODE GetVdmExitCode;
-        BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest;
-        BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest;
+        BASE_CHECK_VDM CheckVDMRequest;
+        BASE_UPDATE_VDM_ENTRY UpdateVDMEntryRequest;
+        BASE_GET_NEXT_VDM_COMMAND GetNextVDMCommandRequest;
+        BASE_EXIT_VDM ExitVDMRequest;
+        BASE_IS_FIRST_VDM IsFirstVDMRequest;
+        BASE_GET_VDM_EXIT_CODE GetVDMExitCodeRequest;
+        BASE_SET_REENTER_COUNT SetReenterCountRequest;
+        BASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest;
+        BASE_GETSET_VDM_CURDIRS VDMCurrentDirsRequest;
+        BASE_BAT_NOTIFICATION BatNotificationRequest;
+        BASE_REGISTER_WOWEXEC RegisterWowExecRequest;

         BASE_SOUND_SENTRY SoundSentryRequest;
         BASE_SOUND_SENTRY SoundSentryRequest;

+        BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest;

         BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest;
     } Data;
 } BASE_API_MESSAGE, *PBASE_API_MESSAGE;
         BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest;
     } Data;
 } BASE_API_MESSAGE, *PBASE_API_MESSAGE;

diff --git a/reactos/subsystems/win/basesrv/dosdev.c b/reactos/subsystems/win/basesrv/dosdev.c
index 148c2ea..bd803eb 100644 (file)
--- a/reactos/subsystems/win/basesrv/dosdev.c
+++ b/reactos/subsystems/win/basesrv/dosdev.c
@@ -99,17 +99,17 @@ CSR_API(BaseSrvDefineDosDevice)
     DWORD dwFlags;
     PWSTR lpBuffer;
 
     DWORD dwFlags;
     PWSTR lpBuffer;
 

-    DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetName:%wZ\n",
-           DefineDosDeviceRequest->dwFlags,
+    DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetPath:%wZ\n",
+           DefineDosDeviceRequest->Flags,

            &DefineDosDeviceRequest->DeviceName,
            &DefineDosDeviceRequest->DeviceName,

-           &DefineDosDeviceRequest->TargetName);
+           &DefineDosDeviceRequest->TargetPath);

 
     Matched = AddHistory = FALSE;
     HistoryEntry = NULL;
     AdminSid = SystemSid = WorldSid = NULL;
     SecurityDescriptor = NULL;
     ListHead = &DosDeviceHistory;
 
     Matched = AddHistory = FALSE;
     HistoryEntry = NULL;
     AdminSid = SystemSid = WorldSid = NULL;
     SecurityDescriptor = NULL;
     ListHead = &DosDeviceHistory;

-    dwFlags = DefineDosDeviceRequest->dwFlags;
+    dwFlags = DefineDosDeviceRequest->Flags;

 
     /* Validate the flags */
     if ( (dwFlags & 0xFFFFFFF0) ||
 
     /* Validate the flags */
     if ( (dwFlags & 0xFFFFFFF0) ||


@@ -136,7 +136,7 @@ CSR_API(BaseSrvDefineDosDevice)
         if (!NT_SUCCESS(Status))
             _SEH2_LEAVE;
 
         if (!NT_SUCCESS(Status))
             _SEH2_LEAVE;
 

-        RequestLinkTarget = &DefineDosDeviceRequest->TargetName;
+        RequestLinkTarget = &DefineDosDeviceRequest->TargetPath;

         lpBuffer = (PWSTR)RtlAllocateHeap(BaseSrvHeap,
                                           HEAP_ZERO_MEMORY,
                                           RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR));
         lpBuffer = (PWSTR)RtlAllocateHeap(BaseSrvHeap,
                                           HEAP_ZERO_MEMORY,
                                           RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR));

diff --git a/reactos/subsystems/win/basesrv/proc.c b/reactos/subsystems/win/basesrv/proc.c
index 8705372..ac06ed6 100644 (file)
--- a/reactos/subsystems/win/basesrv/proc.c
+++ b/reactos/subsystems/win/basesrv/proc.c
@@ -18,7 +18,7 @@
 CSR_API(BaseSrvGetTempFile)
 {
     static UINT BaseGetTempFileUnique = 0;
 CSR_API(BaseSrvGetTempFile)
 {
     static UINT BaseGetTempFileUnique = 0;

-    PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFile;
+    PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFileRequest;

 
     /* Return 16-bits ID */
     GetTempFile->UniqueID = (++BaseGetTempFileUnique & 0xFFFF);
 
     /* Return 16-bits ID */
     GetTempFile->UniqueID = (++BaseGetTempFileUnique & 0xFFFF);


@@ -211,24 +211,24 @@ CSR_API(BaseSrvExitProcess)
 
 CSR_API(BaseSrvGetProcessShutdownParam)
 {
 
 CSR_API(BaseSrvGetProcessShutdownParam)
 {

-    PBASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetShutdownParametersRequest;
+    PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.ShutdownParametersRequest;

     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
 
     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
 

-    GetShutdownParametersRequest->Level = CsrThread->Process->ShutdownLevel;
-    GetShutdownParametersRequest->Flags = CsrThread->Process->ShutdownFlags;
+    ShutdownParametersRequest->ShutdownLevel = CsrThread->Process->ShutdownLevel;
+    ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags;

 
     return STATUS_SUCCESS;
 }
 
 CSR_API(BaseSrvSetProcessShutdownParam)
 {
 
     return STATUS_SUCCESS;
 }
 
 CSR_API(BaseSrvSetProcessShutdownParam)
 {

-    PBASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.SetShutdownParametersRequest;
+    PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.ShutdownParametersRequest;

     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
 
     PCSR_THREAD CsrThread = CsrGetClientThread();
     ASSERT(CsrThread);
 

-    CsrThread->Process->ShutdownLevel = SetShutdownParametersRequest->Level;
-    CsrThread->Process->ShutdownFlags = SetShutdownParametersRequest->Flags;
+    CsrThread->Process->ShutdownLevel = ShutdownParametersRequest->ShutdownLevel;
+    CsrThread->Process->ShutdownFlags = ShutdownParametersRequest->ShutdownFlags;

 
     return STATUS_SUCCESS;
 }
 
     return STATUS_SUCCESS;
 }

diff --git a/reactos/subsystems/win/basesrv/vdm.c b/reactos/subsystems/win/basesrv/vdm.c
index 504874e..d698f4a 100644 (file)
--- a/reactos/subsystems/win/basesrv/vdm.c
+++ b/reactos/subsystems/win/basesrv/vdm.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Base API Server DLL
  * FILE:            subsystems/win/basesrv/vdm.c
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Base API Server DLL
  * FILE:            subsystems/win/basesrv/vdm.c

- * PURPOSE:         Virtual DOS Machines Management
+ * PURPOSE:         Virtual DOS Machines (VDM) Support

  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */