Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[hbirr] 15470: ObInsertObject must always return STATUS_OBJECT_NAME_COLLISION if an object with the same name exist.

by hbirr＠svn.reactos.com

ObInsertObject must always return STATUS_OBJECT_NAME_COLLISION if an object with the same name exist. Modified: trunk/reactos/ntoskrnl/ob/handle.c _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-05-22 16:44:36 UTC (rev 15469) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-05-22 16:48:30 UTC (rev 15470) @@ -739,6 +739,10 @@ "ObjectType %x, AccessMode %d, Object %x)\n",Handle,DesiredAccess, ObjectType,AccessMode,Object); + if (Handle == NULL) + { + return STATUS_INVALID_HANDLE; + } /* * Handle special handle names */ @@ -986,13 +990,8 @@ if (FoundHeader && RemainingPath.Buffer == NULL) { DPRINT("Object exists\n"); - if (FoundHeader->ObjectType != Header->ObjectType - || !(ObjectCreateInfo->Attributes & OBJ_OPENIF)) - { - ObDereferenceObject(FoundObject); - return STATUS_OBJECT_NAME_COLLISION; - } - return STATUS_OBJECT_EXISTS; + ObDereferenceObject(FoundObject); + return STATUS_OBJECT_NAME_COLLISION; } } else

19 years, 4 months

[hbirr] 15469: Don't create the media change event as named object.

by hbirr＠svn.reactos.com

Don't create the media change event as named object. Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/disk/disk.c _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-05-22 16:10:10 UTC (rev 15468) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-05-22 16:44:36 UTC (rev 15469) @@ -391,17 +391,10 @@ CdromClassCreateMediaChangeEvent(IN PDEVICE_EXTENSION DeviceExtension, IN ULONG DeviceNumber) { - WCHAR NameBuffer[MAX_PATH]; - UNICODE_STRING Name; - swprintf (NameBuffer, - L"\\Device\\MediaChangeEvent%lu", - DeviceNumber); - RtlInitUnicodeString (&Name, - NameBuffer); DeviceExtension->MediaChangeEvent = - IoCreateSynchronizationEvent (&Name, + IoCreateSynchronizationEvent (NULL, &DeviceExtension->MediaChangeEventHandle); KeClearEvent (DeviceExtension->MediaChangeEvent); _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-05-22 16:10:10 UTC (rev 15468) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-05-22 16:44:36 UTC (rev 15469) @@ -315,17 +315,8 @@ DiskClassCreateMediaChangeEvent(IN PDEVICE_EXTENSION DeviceExtension, IN ULONG DeviceNumber) { - WCHAR NameBuffer[MAX_PATH]; - UNICODE_STRING Name; - - swprintf (NameBuffer, - L"\\Device\\MediaChangeEvent%lu", - DeviceNumber); - RtlInitUnicodeString (&Name, - NameBuffer); - DeviceExtension->MediaChangeEvent = - IoCreateSynchronizationEvent (&Name, + IoCreateSynchronizationEvent (NULL, &DeviceExtension->MediaChangeEventHandle); KeClearEvent (DeviceExtension->MediaChangeEvent);

19 years, 4 months

[ea] 15468: svn propset {keyword, eol-type}

by ea＠svn.reactos.com

svn propset {keyword, eol-type} Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/initdosdev.c Modified: trunk/reactos/subsys/smss/initenv.c Modified: trunk/reactos/subsys/smss/initheap.c Modified: trunk/reactos/subsys/smss/initmv.c Modified: trunk/reactos/subsys/smss/initobdir.c Modified: trunk/reactos/subsys/smss/initpage.c Modified: trunk/reactos/subsys/smss/initreg.c Modified: trunk/reactos/subsys/smss/initrun.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/initwkdll.c Modified: trunk/reactos/subsys/smss/print.c Modified: trunk/reactos/subsys/smss/smapicomp.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smapiquery.c _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-05-22 15:54:15 UTC (rev 15467) +++ trunk/reactos/subsys/smss/client.c 2005-05-22 16:10:10 UTC (rev 15468) @@ -1,448 +1,448 @@ -/* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $ - * - * client.c - Session Manager client Management - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- - */ -#define NTOS_MODE_USER -#include <ntos.h> -#include "smss.h" -#include <sm/helper.h> - -#define NDEBUG -#include <debug.h> - -/* Private ADT */ - - -struct _SM_CLIENT_DIRECTORY -{ - RTL_CRITICAL_SECTION Lock; - ULONG Count; - PSM_CLIENT_DATA Client; - PSM_CLIENT_DATA CandidateClient; - -} SmpClientDirectory; - - -/********************************************************************** - * SmInitializeClientManagement/0 - */ -NTSTATUS -SmInitializeClientManagement (VOID) -{ - DPRINT("SM: %s called\n", __FUNCTION__); - RtlInitializeCriticalSection(& SmpClientDirectory.Lock); - SmpClientDirectory.Count = 0; - SmpClientDirectory.Client = NULL; - SmpClientDirectory.CandidateClient = NULL; - return STATUS_SUCCESS; - -} -/********************************************************************** - * SmpSetClientInitialized/1 - */ -VOID FASTCALL -SmpSetClientInitialized (PSM_CLIENT_DATA Client) -{ - Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; -} -/********************************************************************** - * SmpLookupClient/2 PRIVATE - * - * DESCRIPTION - * Lookup the subsystem server descriptor given its image ID. - * - * ARGUMENTS - * SubsystemId: IMAGE_SUBSYSTEM_xxx - * Parent: optional: caller provided storage for the - * the pointer to the SM_CLIENT_DATA which - * Next field contains the value returned by - * the function (on success). - * - * RETURN VALUES - * NULL on error; otherwise a pointer to the SM_CLIENT_DATA - * looked up object. - * - * WARNING - * SmpClientDirectory.Lock must be held by the caller. - */ -static PSM_CLIENT_DATA FASTCALL -SmpLookupClient (USHORT SubsystemId, - PSM_CLIENT_DATA * Parent) -{ - PSM_CLIENT_DATA Client = NULL; - - DPRINT("SM: %s(%d) called\n", __FUNCTION__, SubsystemId); - - if(NULL != Parent) - { - *Parent = NULL; - } - if (SmpClientDirectory.Count > 0) - { - Client = SmpClientDirectory.Client; - while (NULL != Client) - { - if (SubsystemId == Client->SubsystemId) - { - break; - } - if(NULL != Parent) - { - *Parent = Client; - } - Client = Client->Next; - } - } - return Client; -} -/********************************************************************** - * SmBeginClientInitialization/1 - * - * DESCRIPTION - * Check if the candidate client matches the begin session - * message from the subsystem process. - * - * ARGUMENTS - * Request: message received by \SmApiPort - * ClientData: - * - * RETURN VALUES - * NTSTATUS - */ -NTSTATUS STDCALL -SmBeginClientInitialization (IN PSM_PORT_MESSAGE Request, - OUT PSM_CLIENT_DATA * ClientData) -{ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); - ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); - - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - /* - * Is there a subsystem bootstrap in progress? - */ - if (SmpClientDirectory.CandidateClient) - { - PROCESS_BASIC_INFORMATION pbi; - - RtlZeroMemory (& pbi, sizeof pbi); - Status = NtQueryInformationProcess (Request->Header.ClientId.UniqueProcess, - ProcessBasicInformation, - & pbi, - sizeof pbi, - NULL); - if (NT_SUCCESS(Status)) - { - SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) pbi.UniqueProcessId; - } - } - else - { - RtlFreeHeap (SmpHeap, 0, SmpClientDirectory.CandidateClient); - DPRINT1("SM: %s: subsys booting with no descriptor!\n", __FUNCTION__); - Status = STATUS_NOT_FOUND; - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; - } - /* - * Check if a client for the ID already exist. - */ - if (SmpLookupClient(ConnectData->SubSystemId, NULL)) - { - DPRINT("SM: %s: attempt to register again subsystem %d.\n", - __FUNCTION__, - ConnectData->SubSystemId); - return STATUS_UNSUCCESSFUL; - } - DPRINT("SM: %s: registering subsystem ID=%d \n", - __FUNCTION__, ConnectData->SubSystemId); - - /* - * Initialize the client data - */ - SmpClientDirectory.CandidateClient->SubsystemId = ConnectData->SubSystemId; - /* SM && DBG auto-initializes; other subsystems are required to call - * SM_API_COMPLETE_SESSION via SMDLL. */ - if ((IMAGE_SUBSYSTEM_NATIVE == SmpClientDirectory.CandidateClient->SubsystemId) || - (IMAGE_SUBSYSTEM_UNKNOWN == SmpClientDirectory.CandidateClient->SubsystemId)) - { - SmpSetClientInitialized (SmpClientDirectory.CandidateClient); - } - if (SbApiPortNameSize > 0) - { - RtlCopyMemory (SmpClientDirectory.CandidateClient->SbApiPortName, - ConnectData->SbName, - SbApiPortNameSize); - } - /* - * Insert the new descriptor in the - * client directory. - */ - if (NULL == SmpClientDirectory.Client) - { - SmpClientDirectory.Client = SmpClientDirectory.CandidateClient; - } else { - PSM_CLIENT_DATA pCD = NULL; - - for (pCD=SmpClientDirectory.Client; - (NULL != pCD->Next); - pCD = pCD->Next); - pCD->Next = SmpClientDirectory.CandidateClient; - } - SmpClientDirectory.CandidateClient->Next = NULL; - /* - * Increment the number of active subsystems. - */ - ++ SmpClientDirectory.Count; - /* - * Notify to the caller the reference to the client data. - */ - if (ClientData) - { - *ClientData = SmpClientDirectory.CandidateClient; - } - /* - * Free the slot for the candidate subsystem. - */ - SmpClientDirectory.CandidateClient = NULL; - - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - - return STATUS_SUCCESS; -} -/********************************************************************** - * SmCompleteClientInitialization/1 - * - * DESCRIPTION - * Lookup the subsystem server descriptor given the process ID - * of the subsystem server process. - */ -NTSTATUS STDCALL -SmCompleteClientInitialization (ULONG ProcessId) -{ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA Client = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - if (SmpClientDirectory.Count > 0) - { - Client = SmpClientDirectory.Client; - while (NULL != Client) - { - if (ProcessId == Client->ServerProcessId) - { - SmpSetClientInitialized (Client); - break; - } - Client = Client->Next; - } - Status = STATUS_NOT_FOUND; - } - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; -} - -/********************************************************************** - * SmpCreateClient/1 - * - * DESCRIPTION - * Create a "candidate" client. Client descriptor will enter the - * client directory only at the end of the registration - * procedure. Otherwise, we will kill the associated process. - * - * ARGUMENTS - * ProcessHandle: handle of the subsystem server process. - * - * RETURN VALUE - * NTSTATUS: - */ -NTSTATUS STDCALL -SmCreateClient (PRTL_PROCESS_INFO ProcessInfo, PWSTR ProgramName) -{ - NTSTATUS Status = STATUS_SUCCESS; - - - DPRINT("SM: %s(%lx) called\n", __FUNCTION__, ProcessInfo->ProcessHandle); - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - /* - * Check if the candidate client slot is empty. - */ - if (NULL != SmpClientDirectory.CandidateClient) - { - DPRINT1("SM: %s: CandidateClient pending!\n", __FUNCTION__); - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return STATUS_UNSUCCESSFUL; - } - /* - * Allocate the storage for client data - */ - SmpClientDirectory.CandidateClient = - RtlAllocateHeap (SmpHeap, - HEAP_ZERO_MEMORY, - sizeof (SM_CLIENT_DATA)); - if (NULL == SmpClientDirectory.CandidateClient) - { - DPRINT("SM: %s(%lx): out of memory!\n", - __FUNCTION__, ProcessInfo->ProcessHandle); - Status = STATUS_NO_MEMORY; - } - else - { - /* Initialize the candidate client. */ - RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); - SmpClientDirectory.CandidateClient->ServerProcess = - (HANDLE) ProcessInfo->ProcessHandle; - SmpClientDirectory.CandidateClient->ServerProcessId = - (ULONG) ProcessInfo->ClientId.UniqueProcess; - } - /* - * Copy the program name - */ - RtlCopyMemory (SmpClientDirectory.CandidateClient->ProgramName, - ProgramName, - SM_SB_NAME_MAX_LENGTH); - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; -} - -/********************************************************************** - * SmpDestroyClient/1 - * - * 1. close any handle - * 2. kill client process - * 3. release resources - */ -NTSTATUS STDCALL -SmDestroyClient (ULONG SubsystemId) -{ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA Parent = NULL; - PSM_CLIENT_DATA Client = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - Client = SmpLookupClient (SubsystemId, & Parent); - if(NULL == Client) - { - DPRINT1("SM: %s: del req for non existent subsystem (id=%d)\n", - __FUNCTION__, SubsystemId); - Status = STATUS_NOT_FOUND; - } - else - { - /* 1st in the list? */ - if(NULL == Parent) - { - SmpClientDirectory.Client = Client->Next; - } - else - { - if(NULL != Parent) - { - Parent->Next = Client->Next; - } else { - DPRINT1("SM: %s: n-th has no parent!\n", __FUNCTION__); - Status = STATUS_UNSUCCESSFUL; /* FIXME */ - } - } - /* TODO: send shutdown or kill */ - NtTerminateProcess (Client->ServerProcess, 0); //FIXME - RtlFreeHeap (SmpHeap, 0, Client); - -- SmpClientDirectory.Count; - } - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; -} - -/* === Utilities for SmQryInfo === */ - -/********************************************************************** - * SmGetClientBasicInformation/1 - */ -NTSTATUS FASTCALL -SmGetClientBasicInformation (PSM_BASIC_INFORMATION i) -{ - INT Index = 0; - PSM_CLIENT_DATA ClientData = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - - i->SubSystemCount = SmpClientDirectory.Count; - i->Unused = 0; - - if (SmpClientDirectory.Count > 0) - { - ClientData = SmpClientDirectory.Client; - while ((NULL != ClientData) && (Index < SM_QRYINFO_MAX_SS_COUNT)) - { - i->SubSystem[Index].Id = ClientData->SubsystemId; - i->SubSystem[Index].Flags = ClientData->Flags; - i->SubSystem[Index].ProcessId = ClientData->ServerProcessId; - ClientData = ClientData->Next; - } - } - - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return STATUS_SUCCESS; -} - -/********************************************************************** - * SmGetSubSystemInformation/1 - */ -NTSTATUS FASTCALL -SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i) -{ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA ClientData = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - ClientData = SmpLookupClient (i->SubSystemId, NULL); - if (NULL == ClientData) - { - Status = STATUS_NOT_FOUND; - } - else - { - i->Flags = ClientData->Flags; - i->ProcessId = ClientData->ServerProcessId; - RtlCopyMemory (i->NameSpaceRootNode, - ClientData->SbApiPortName, - (SM_QRYINFO_MAX_ROOT_NODE * sizeof(i->NameSpaceRootNode[0]))); - } - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; -} - -/* EOF */ +/* $Id$ + * + * client.c - Session Manager client Management + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include "smss.h" +#include <sm/helper.h> + +#define NDEBUG +#include <debug.h> + +/* Private ADT */ + + +struct _SM_CLIENT_DIRECTORY +{ + RTL_CRITICAL_SECTION Lock; + ULONG Count; + PSM_CLIENT_DATA Client; + PSM_CLIENT_DATA CandidateClient; + +} SmpClientDirectory; + + +/********************************************************************** + * SmInitializeClientManagement/0 + */ +NTSTATUS +SmInitializeClientManagement (VOID) +{ + DPRINT("SM: %s called\n", __FUNCTION__); + RtlInitializeCriticalSection(& SmpClientDirectory.Lock); + SmpClientDirectory.Count = 0; + SmpClientDirectory.Client = NULL; + SmpClientDirectory.CandidateClient = NULL; + return STATUS_SUCCESS; + +} +/********************************************************************** + * SmpSetClientInitialized/1 + */ +VOID FASTCALL +SmpSetClientInitialized (PSM_CLIENT_DATA Client) +{ + Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; +} +/********************************************************************** + * SmpLookupClient/2 PRIVATE + * + * DESCRIPTION + * Lookup the subsystem server descriptor given its image ID. + * + * ARGUMENTS + * SubsystemId: IMAGE_SUBSYSTEM_xxx + * Parent: optional: caller provided storage for the + * the pointer to the SM_CLIENT_DATA which + * Next field contains the value returned by + * the function (on success). + * + * RETURN VALUES + * NULL on error; otherwise a pointer to the SM_CLIENT_DATA + * looked up object. + * + * WARNING + * SmpClientDirectory.Lock must be held by the caller. + */ +static PSM_CLIENT_DATA FASTCALL +SmpLookupClient (USHORT SubsystemId, + PSM_CLIENT_DATA * Parent) +{ + PSM_CLIENT_DATA Client = NULL; + + DPRINT("SM: %s(%d) called\n", __FUNCTION__, SubsystemId); + + if(NULL != Parent) + { + *Parent = NULL; + } + if (SmpClientDirectory.Count > 0) + { + Client = SmpClientDirectory.Client; + while (NULL != Client) + { + if (SubsystemId == Client->SubsystemId) + { + break; + } + if(NULL != Parent) + { + *Parent = Client; + } + Client = Client->Next; + } + } + return Client; +} +/********************************************************************** + * SmBeginClientInitialization/1 + * + * DESCRIPTION + * Check if the candidate client matches the begin session + * message from the subsystem process. + * + * ARGUMENTS + * Request: message received by \SmApiPort + * ClientData: + * + * RETURN VALUES + * NTSTATUS + */ +NTSTATUS STDCALL +SmBeginClientInitialization (IN PSM_PORT_MESSAGE Request, + OUT PSM_CLIENT_DATA * ClientData) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); + ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); + + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + /* + * Is there a subsystem bootstrap in progress? + */ + if (SmpClientDirectory.CandidateClient) + { + PROCESS_BASIC_INFORMATION pbi; + + RtlZeroMemory (& pbi, sizeof pbi); + Status = NtQueryInformationProcess (Request->Header.ClientId.UniqueProcess, + ProcessBasicInformation, + & pbi, + sizeof pbi, + NULL); + if (NT_SUCCESS(Status)) + { + SmpClientDirectory.CandidateClient->ServerProcessId = + (ULONG) pbi.UniqueProcessId; + } + } + else + { + RtlFreeHeap (SmpHeap, 0, SmpClientDirectory.CandidateClient); + DPRINT1("SM: %s: subsys booting with no descriptor!\n", __FUNCTION__); + Status = STATUS_NOT_FOUND; + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; + } + /* + * Check if a client for the ID already exist. + */ + if (SmpLookupClient(ConnectData->SubSystemId, NULL)) + { + DPRINT("SM: %s: attempt to register again subsystem %d.\n", + __FUNCTION__, + ConnectData->SubSystemId); + return STATUS_UNSUCCESSFUL; + } + DPRINT("SM: %s: registering subsystem ID=%d \n", + __FUNCTION__, ConnectData->SubSystemId); + + /* + * Initialize the client data + */ + SmpClientDirectory.CandidateClient->SubsystemId = ConnectData->SubSystemId; + /* SM && DBG auto-initializes; other subsystems are required to call + * SM_API_COMPLETE_SESSION via SMDLL. */ + if ((IMAGE_SUBSYSTEM_NATIVE == SmpClientDirectory.CandidateClient->SubsystemId) || + (IMAGE_SUBSYSTEM_UNKNOWN == SmpClientDirectory.CandidateClient->SubsystemId)) + { + SmpSetClientInitialized (SmpClientDirectory.CandidateClient); + } + if (SbApiPortNameSize > 0) + { + RtlCopyMemory (SmpClientDirectory.CandidateClient->SbApiPortName, + ConnectData->SbName, + SbApiPortNameSize); + } + /* + * Insert the new descriptor in the + * client directory. + */ + if (NULL == SmpClientDirectory.Client) + { + SmpClientDirectory.Client = SmpClientDirectory.CandidateClient; + } else { + PSM_CLIENT_DATA pCD = NULL; + + for (pCD=SmpClientDirectory.Client; + (NULL != pCD->Next); + pCD = pCD->Next); + pCD->Next = SmpClientDirectory.CandidateClient; + } + SmpClientDirectory.CandidateClient->Next = NULL; + /* + * Increment the number of active subsystems. + */ + ++ SmpClientDirectory.Count; + /* + * Notify to the caller the reference to the client data. + */ + if (ClientData) + { + *ClientData = SmpClientDirectory.CandidateClient; + } + /* + * Free the slot for the candidate subsystem. + */ + SmpClientDirectory.CandidateClient = NULL; + + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + + return STATUS_SUCCESS; +} +/********************************************************************** + * SmCompleteClientInitialization/1 + * + * DESCRIPTION + * Lookup the subsystem server descriptor given the process ID + * of the subsystem server process. + */ +NTSTATUS STDCALL +SmCompleteClientInitialization (ULONG ProcessId) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA Client = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + if (SmpClientDirectory.Count > 0) + { + Client = SmpClientDirectory.Client; + while (NULL != Client) + { + if (ProcessId == Client->ServerProcessId) + { + SmpSetClientInitialized (Client); + break; + } + Client = Client->Next; + } + Status = STATUS_NOT_FOUND; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/********************************************************************** + * SmpCreateClient/1 + * + * DESCRIPTION + * Create a "candidate" client. Client descriptor will enter the + * client directory only at the end of the registration + * procedure. Otherwise, we will kill the associated process. + * + * ARGUMENTS + * ProcessHandle: handle of the subsystem server process. + * + * RETURN VALUE + * NTSTATUS: + */ +NTSTATUS STDCALL +SmCreateClient (PRTL_PROCESS_INFO ProcessInfo, PWSTR ProgramName) +{ + NTSTATUS Status = STATUS_SUCCESS; + + + DPRINT("SM: %s(%lx) called\n", __FUNCTION__, ProcessInfo->ProcessHandle); + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + /* + * Check if the candidate client slot is empty. + */ + if (NULL != SmpClientDirectory.CandidateClient) + { + DPRINT1("SM: %s: CandidateClient pending!\n", __FUNCTION__); + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_UNSUCCESSFUL; + } + /* + * Allocate the storage for client data + */ + SmpClientDirectory.CandidateClient = + RtlAllocateHeap (SmpHeap, + HEAP_ZERO_MEMORY, + sizeof (SM_CLIENT_DATA)); + if (NULL == SmpClientDirectory.CandidateClient) + { + DPRINT("SM: %s(%lx): out of memory!\n", + __FUNCTION__, ProcessInfo->ProcessHandle); + Status = STATUS_NO_MEMORY; + } + else + { + /* Initialize the candidate client. */ + RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); + SmpClientDirectory.CandidateClient->ServerProcess = + (HANDLE) ProcessInfo->ProcessHandle; + SmpClientDirectory.CandidateClient->ServerProcessId = + (ULONG) ProcessInfo->ClientId.UniqueProcess; + } + /* + * Copy the program name + */ + RtlCopyMemory (SmpClientDirectory.CandidateClient->ProgramName, + ProgramName, + SM_SB_NAME_MAX_LENGTH); + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/********************************************************************** + * SmpDestroyClient/1 + * + * 1. close any handle + * 2. kill client process + * 3. release resources + */ +NTSTATUS STDCALL +SmDestroyClient (ULONG SubsystemId) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA Parent = NULL; + PSM_CLIENT_DATA Client = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + Client = SmpLookupClient (SubsystemId, & Parent); + if(NULL == Client) + { + DPRINT1("SM: %s: del req for non existent subsystem (id=%d)\n", + __FUNCTION__, SubsystemId); + Status = STATUS_NOT_FOUND; + } + else + { + /* 1st in the list? */ + if(NULL == Parent) + { + SmpClientDirectory.Client = Client->Next; + } + else + { + if(NULL != Parent) + { + Parent->Next = Client->Next; + } else { + DPRINT1("SM: %s: n-th has no parent!\n", __FUNCTION__); + Status = STATUS_UNSUCCESSFUL; /* FIXME */ + } + } + /* TODO: send shutdown or kill */ + NtTerminateProcess (Client->ServerProcess, 0); //FIXME + RtlFreeHeap (SmpHeap, 0, Client); + -- SmpClientDirectory.Count; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/* === Utilities for SmQryInfo === */ + +/********************************************************************** + * SmGetClientBasicInformation/1 + */ +NTSTATUS FASTCALL +SmGetClientBasicInformation (PSM_BASIC_INFORMATION i) +{ + INT Index = 0; + PSM_CLIENT_DATA ClientData = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + + i->SubSystemCount = SmpClientDirectory.Count; + i->Unused = 0; + + if (SmpClientDirectory.Count > 0) + { + ClientData = SmpClientDirectory.Client; + while ((NULL != ClientData) && (Index < SM_QRYINFO_MAX_SS_COUNT)) + { + i->SubSystem[Index].Id = ClientData->SubsystemId; + i->SubSystem[Index].Flags = ClientData->Flags; + i->SubSystem[Index].ProcessId = ClientData->ServerProcessId; + ClientData = ClientData->Next; + } + } + + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_SUCCESS; +} + +/********************************************************************** + * SmGetSubSystemInformation/1 + */ +NTSTATUS FASTCALL +SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA ClientData = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + ClientData = SmpLookupClient (i->SubSystemId, NULL); + if (NULL == ClientData) + { + Status = STATUS_NOT_FOUND; + } + else + { + i->Flags = ClientData->Flags; + i->ProcessId = ClientData->ServerProcessId; + RtlCopyMemory (i->NameSpaceRootNode, + ClientData->SbApiPortName, + (SM_QRYINFO_MAX_ROOT_NODE * sizeof(i->NameSpaceRootNode[0]))); + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/subsys/smss/client.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-05-22 15:54:15 UTC (rev 15467) +++ trunk/reactos/subsys/smss/debug.c 2005-05-22 16:10:10 UTC (rev 15468) @@ -1,173 +1,173 @@ -/* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $ - * - * debug.c - Session Manager debug messages switch and router - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- - */ -#define NTOS_MODE_USER -#include <ntos.h> -#include <rosrtl/string.h> -#include "smss.h" - -#define NDEBUG -#include <debug.h> - - -/* GLOBALS ***********************************************************/ - -HANDLE DbgSsApiPort = (HANDLE) 0; -HANDLE DbgUiApiPort = (HANDLE) 0; - -/* FUNCTIONS *********************************************************/ - -static VOID STDCALL -DbgSsApiPortThread (PVOID dummy) -{ - NTSTATUS Status = STATUS_SUCCESS; - LPC_MAX_MESSAGE Request = {{0}}; - - while (TRUE) - { - Status = NtListenPort (DbgSsApiPort, & Request.Header); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: NtListenPort() failed! (Status==x%08lx)\n", __FUNCTION__, Status); - break; - } - /* TODO */ - } - NtTerminateThread(NtCurrentThread(),Status); -} - -static VOID STDCALL -DbgUiApiPortThread (PVOID dummy) -{ - NTSTATUS Status = STATUS_SUCCESS; - LPC_MAX_MESSAGE Request = {{0}}; - - while (TRUE) - { - Status = NtListenPort (DbgUiApiPort, & Request.Header); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: NtListenPort() failed! (Status==x%08lx)\n", __FUNCTION__, Status); - break; - } - /* TODO */ - } - NtTerminateThread(NtCurrentThread(),Status); -} - -static NTSTATUS STDCALL -SmpCreatePT (IN OUT PHANDLE hPort, - IN LPWSTR wcPortName, - IN ULONG ulMaxDataSize, - IN ULONG ulMaxMessageSize, - IN ULONG ulPoolCharge OPTIONAL, - IN VOID (STDCALL * procServingThread)(PVOID) OPTIONAL, - IN OUT PHANDLE phServingThread OPTIONAL) -{ [truncated at 1000 lines; 4024 more skipped]

19 years, 4 months

[ea] 15467: SM: change the way sessions are managed.

by ea＠svn.reactos.com

SM: change the way sessions are managed. (it may be buggy) Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/initmv.c Modified: trunk/reactos/subsys/smss/initrun.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapicomp.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/client.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -39,9 +39,11 @@ RTL_CRITICAL_SECTION Lock; ULONG Count; PSM_CLIENT_DATA Client; + PSM_CLIENT_DATA CandidateClient; } SmpClientDirectory; + /********************************************************************** * SmInitializeClientManagement/0 */ @@ -52,56 +54,41 @@ RtlInitializeCriticalSection(& SmpClientDirectory.Lock); SmpClientDirectory.Count = 0; SmpClientDirectory.Client = NULL; + SmpClientDirectory.CandidateClient = NULL; return STATUS_SUCCESS; } - /********************************************************************** - * SmCompleteClientInitialization/1 - * - * DESCRIPTION - * Lookup the subsystem server descriptor given the process handle - * of the subsystem server process. + * SmpSetClientInitialized/1 */ -NTSTATUS STDCALL -SmCompleteClientInitialization (HANDLE hProcess) +VOID FASTCALL +SmpSetClientInitialized (PSM_CLIENT_DATA Client) { - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA Client = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - if (SmpClientDirectory.Count > 0) - { - Client = SmpClientDirectory.Client; - while (NULL != Client) - { - if (hProcess == Client->ServerProcess) - { - Client->Initialized = TRUE; - break; - } - Client = Client->Next; - } - Status = STATUS_NOT_FOUND; - } - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - return Status; + Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; } - /********************************************************************** - * SmpLookupClient/1 PRIVATE + * SmpLookupClient/2 PRIVATE * * DESCRIPTION * Lookup the subsystem server descriptor given its image ID. * - * SIDE EFFECTS - * SmpClientDirectory.Lock is released only on success. + * ARGUMENTS + * SubsystemId: IMAGE_SUBSYSTEM_xxx + * Parent: optional: caller provided storage for the + * the pointer to the SM_CLIENT_DATA which + * Next field contains the value returned by + * the function (on success). + * + * RETURN VALUES + * NULL on error; otherwise a pointer to the SM_CLIENT_DATA + * looked up object. + * + * WARNING + * SmpClientDirectory.Lock must be held by the caller. */ static PSM_CLIENT_DATA FASTCALL -SmpLookupClientUnsafe (USHORT SubsystemId, - PSM_CLIENT_DATA * Parent) +SmpLookupClient (USHORT SubsystemId, + PSM_CLIENT_DATA * Parent) { PSM_CLIENT_DATA Client = NULL; @@ -129,72 +116,86 @@ } return Client; } - -static PSM_CLIENT_DATA STDCALL -SmpLookupClient (USHORT SubsystemId) -{ - PSM_CLIENT_DATA Client = NULL; - - DPRINT("SM: %s called\n", __FUNCTION__); - - RtlEnterCriticalSection (& SmpClientDirectory.Lock); - Client = SmpLookupClientUnsafe (SubsystemId, NULL); - if(NULL != Client) - { - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); - } - /* - * Note that we do *not* release SmpClientDirectory.Lock here - * because SmpLookupClient is called to FAIL when SubsystemId - * is not registered yet. - */ - return Client; -} - /********************************************************************** - * SmpCreateClient/2 + * SmBeginClientInitialization/1 + * + * DESCRIPTION + * Check if the candidate client matches the begin session + * message from the subsystem process. + * + * ARGUMENTS + * Request: message received by \SmApiPort + * ClientData: + * + * RETURN VALUES + * NTSTATUS */ NTSTATUS STDCALL -SmCreateClient(PSM_PORT_MESSAGE Request, PSM_CLIENT_DATA * ClientData) +SmBeginClientInitialization (IN PSM_PORT_MESSAGE Request, + OUT PSM_CLIENT_DATA * ClientData) { - PSM_CLIENT_DATA pClient = NULL; + NTSTATUS Status = STATUS_SUCCESS; PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); + DPRINT("SM: %s called\n", __FUNCTION__); - + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); /* + * Is there a subsystem bootstrap in progress? + */ + if (SmpClientDirectory.CandidateClient) + { + PROCESS_BASIC_INFORMATION pbi; + + RtlZeroMemory (& pbi, sizeof pbi); + Status = NtQueryInformationProcess (Request->Header.ClientId.UniqueProcess, + ProcessBasicInformation, + & pbi, + sizeof pbi, + NULL); + if (NT_SUCCESS(Status)) + { + SmpClientDirectory.CandidateClient->ServerProcessId = + (ULONG) pbi.UniqueProcessId; + } + } + else + { + RtlFreeHeap (SmpHeap, 0, SmpClientDirectory.CandidateClient); + DPRINT1("SM: %s: subsys booting with no descriptor!\n", __FUNCTION__); + Status = STATUS_NOT_FOUND; + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; + } + /* * Check if a client for the ID already exist. */ - if (SmpLookupClient(ConnectData->SubSystemId)) + if (SmpLookupClient(ConnectData->SubSystemId, NULL)) { DPRINT("SM: %s: attempt to register again subsystem %d.\n", __FUNCTION__, ConnectData->SubSystemId); return STATUS_UNSUCCESSFUL; } - DPRINT("SM: %s: registering subsystem ID=%d \n", __FUNCTION__, ConnectData->SubSystemId); + DPRINT("SM: %s: registering subsystem ID=%d \n", + __FUNCTION__, ConnectData->SubSystemId); + /* - * Allocate the storage for client data + * Initialize the client data */ - pClient = RtlAllocateHeap (SmpHeap, - HEAP_ZERO_MEMORY, - sizeof (SM_CLIENT_DATA)); - if (NULL == pClient) + SmpClientDirectory.CandidateClient->SubsystemId = ConnectData->SubSystemId; + /* SM && DBG auto-initializes; other subsystems are required to call + * SM_API_COMPLETE_SESSION via SMDLL. */ + if ((IMAGE_SUBSYSTEM_NATIVE == SmpClientDirectory.CandidateClient->SubsystemId) || + (IMAGE_SUBSYSTEM_UNKNOWN == SmpClientDirectory.CandidateClient->SubsystemId)) { - DPRINT("SM: %s: out of memory!\n",__FUNCTION__); - return STATUS_NO_MEMORY; + SmpSetClientInitialized (SmpClientDirectory.CandidateClient); } - /* - * Initialize the client data - */ - pClient->SubsystemId = ConnectData->SubSystemId; - /* SM auto-initializes; other subsystems are required to call - * SM_API_COMPLETE_SESSION via SMDLL. */ - pClient->Initialized = (IMAGE_SUBSYSTEM_NATIVE == pClient->SubsystemId); if (SbApiPortNameSize > 0) { - RtlCopyMemory (pClient->SbApiPortName, + RtlCopyMemory (SmpClientDirectory.CandidateClient->SbApiPortName, ConnectData->SbName, SbApiPortNameSize); } @@ -204,30 +205,134 @@ */ if (NULL == SmpClientDirectory.Client) { - SmpClientDirectory.Client = pClient; + SmpClientDirectory.Client = SmpClientDirectory.CandidateClient; } else { PSM_CLIENT_DATA pCD = NULL; for (pCD=SmpClientDirectory.Client; (NULL != pCD->Next); pCD = pCD->Next); - pCD->Next = pClient; + pCD->Next = SmpClientDirectory.CandidateClient; } - pClient->Next = NULL; + SmpClientDirectory.CandidateClient->Next = NULL; + /* + * Increment the number of active subsystems. + */ ++ SmpClientDirectory.Count; /* - * Note we unlock the client directory here, because - * it was locked by SmpLookupClient on failure. + * Notify to the caller the reference to the client data. */ - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); if (ClientData) { - *ClientData = pClient; + *ClientData = SmpClientDirectory.CandidateClient; } + /* + * Free the slot for the candidate subsystem. + */ + SmpClientDirectory.CandidateClient = NULL; + + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_SUCCESS; } +/********************************************************************** + * SmCompleteClientInitialization/1 + * + * DESCRIPTION + * Lookup the subsystem server descriptor given the process ID + * of the subsystem server process. + */ +NTSTATUS STDCALL +SmCompleteClientInitialization (ULONG ProcessId) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA Client = NULL; + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + if (SmpClientDirectory.Count > 0) + { + Client = SmpClientDirectory.Client; + while (NULL != Client) + { + if (ProcessId == Client->ServerProcessId) + { + SmpSetClientInitialized (Client); + break; + } + Client = Client->Next; + } + Status = STATUS_NOT_FOUND; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + /********************************************************************** + * SmpCreateClient/1 + * + * DESCRIPTION + * Create a "candidate" client. Client descriptor will enter the + * client directory only at the end of the registration + * procedure. Otherwise, we will kill the associated process. + * + * ARGUMENTS + * ProcessHandle: handle of the subsystem server process. + * + * RETURN VALUE + * NTSTATUS: + */ +NTSTATUS STDCALL +SmCreateClient (PRTL_PROCESS_INFO ProcessInfo, PWSTR ProgramName) +{ + NTSTATUS Status = STATUS_SUCCESS; + + + DPRINT("SM: %s(%lx) called\n", __FUNCTION__, ProcessInfo->ProcessHandle); + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + /* + * Check if the candidate client slot is empty. + */ + if (NULL != SmpClientDirectory.CandidateClient) + { + DPRINT1("SM: %s: CandidateClient pending!\n", __FUNCTION__); + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_UNSUCCESSFUL; + } + /* + * Allocate the storage for client data + */ + SmpClientDirectory.CandidateClient = + RtlAllocateHeap (SmpHeap, + HEAP_ZERO_MEMORY, + sizeof (SM_CLIENT_DATA)); + if (NULL == SmpClientDirectory.CandidateClient) + { + DPRINT("SM: %s(%lx): out of memory!\n", + __FUNCTION__, ProcessInfo->ProcessHandle); + Status = STATUS_NO_MEMORY; + } + else + { + /* Initialize the candidate client. */ + RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); + SmpClientDirectory.CandidateClient->ServerProcess = + (HANDLE) ProcessInfo->ProcessHandle; + SmpClientDirectory.CandidateClient->ServerProcessId = + (ULONG) ProcessInfo->ClientId.UniqueProcess; + } + /* + * Copy the program name + */ + RtlCopyMemory (SmpClientDirectory.CandidateClient->ProgramName, + ProgramName, + SM_SB_NAME_MAX_LENGTH); + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/********************************************************************** * SmpDestroyClient/1 * * 1. close any handle @@ -244,7 +349,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); RtlEnterCriticalSection (& SmpClientDirectory.Lock); - Client = SmpLookupClientUnsafe (SubsystemId, & Parent); + Client = SmpLookupClient (SubsystemId, & Parent); if(NULL == Client) { DPRINT1("SM: %s: del req for non existent subsystem (id=%d)\n", @@ -269,6 +374,7 @@ } } /* TODO: send shutdown or kill */ + NtTerminateProcess (Client->ServerProcess, 0); //FIXME RtlFreeHeap (SmpHeap, 0, Client); -- SmpClientDirectory.Count; } @@ -285,7 +391,7 @@ SmGetClientBasicInformation (PSM_BASIC_INFORMATION i) { INT Index = 0; - PSM_CLIENT_DATA Client = NULL; + PSM_CLIENT_DATA ClientData = NULL; DPRINT("SM: %s called\n", __FUNCTION__); @@ -296,13 +402,13 @@ if (SmpClientDirectory.Count > 0) { - Client = SmpClientDirectory.Client; - while ((NULL != Client) && (Index < SM_QRYINFO_MAX_SS_COUNT)) + ClientData = SmpClientDirectory.Client; + while ((NULL != ClientData) && (Index < SM_QRYINFO_MAX_SS_COUNT)) { - i->SubSystem[Index].Id = Client->SubsystemId; - i->SubSystem[Index].Flags = 0; /* TODO */ - i->SubSystem[Index].ProcessId = 0; /* TODO */ - Client = Client->Next; + i->SubSystem[Index].Id = ClientData->SubsystemId; + i->SubSystem[Index].Flags = ClientData->Flags; + i->SubSystem[Index].ProcessId = ClientData->ServerProcessId; + ClientData = ClientData->Next; } } @@ -316,9 +422,27 @@ NTSTATUS FASTCALL SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i) { + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA ClientData = NULL; + DPRINT("SM: %s called\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + ClientData = SmpLookupClient (i->SubSystemId, NULL); + if (NULL == ClientData) + { + Status = STATUS_NOT_FOUND; + } + else + { + i->Flags = ClientData->Flags; + i->ProcessId = ClientData->ServerProcessId; + RtlCopyMemory (i->NameSpaceRootNode, + ClientData->SbApiPortName, + (SM_QRYINFO_MAX_ROOT_NODE * sizeof(i->NameSpaceRootNode[0]))); + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; } /* EOF */ _____ Modified: trunk/reactos/subsys/smss/initmv.c --- trunk/reactos/subsys/smss/initmv.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/initmv.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -23,6 +23,7 @@ * * -------------------------------------------------------------------- */ + #include "smss.h" @@ -35,6 +36,13 @@ DPRINT("SmProcessFileRenameList() called\n"); /* FIXME: implement it! */ +/* + * open HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\FileRenameOperations + * for each item in its value + * clone the old file in the new name, + * delete the source. + * + */ DPRINT("SmProcessFileRenameList() done\n"); _____ Modified: trunk/reactos/subsys/smss/initrun.c --- trunk/reactos/subsys/smss/initrun.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/initrun.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -29,7 +29,7 @@ #define NDEBUG #include <debug.h> -HANDLE Children[2] = {0, 0}; /* csrss, winlogon */ +//HANDLE Children[2] = {0, 0}; /* csrss, winlogon */ /********************************************************************** @@ -99,10 +99,12 @@ Status = SmCreateUserProcess (ImagePath, CommandLine, TRUE, /* wait */ - NULL, - TRUE, /* terminate */ - NULL); - + NULL, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: running '$S' failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/initss.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -55,23 +55,40 @@ SmpRegisterSmss(VOID) { NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING SbApiPortName = {0,0,NULL}; + RTL_PROCESS_INFO ProcessInfo; DPRINT("SM: %s called\n",__FUNCTION__); - - RtlInitUnicodeString (& SbApiPortName, L""); - Status = SmConnectApiPort(& SbApiPortName, - (HANDLE) -1, /* SM has no SB port */ - IMAGE_SUBSYSTEM_NATIVE, - & hSmApiPort); - if(!NT_SUCCESS(Status)) + + RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); + ProcessInfo.Size = sizeof ProcessInfo; + ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; + ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; + DPRINT("SM: %s: ProcessInfo.ProcessHandle=%lx\n", + __FUNCTION__,ProcessInfo.ProcessHandle); + Status = SmCreateClient (& ProcessInfo, L"Session Manager"); + if (NT_SUCCESS(Status)) { - DPRINT("SM: %s: SMLIB!SmConnectApiPort failed (Status=0x%08lx)\n", - __FUNCTION__,Status); - return Status; + UNICODE_STRING SbApiPortName = {0,0,NULL}; + + RtlInitUnicodeString (& SbApiPortName, L""); + Status = SmConnectApiPort(& SbApiPortName, + (HANDLE) -1, /* SM has no SB port */ + IMAGE_SUBSYSTEM_NATIVE, + & hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("SM: %s: SMLIB!SmConnectApiPort failed (Status=0x%08lx)\n", + __FUNCTION__,Status); + return Status; + } + DPRINT("SM self registered\n"); } - DPRINT("SM self registered\n"); + else + { + DPRINT1("SM: %s: SmCreateClient failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } /* * Note that you don't need to call complete session * because connection handling code autocompletes _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/smapi.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -52,12 +52,13 @@ #endif /********************************************************************** - * SmpCallback/2 + * SmpCallbackServer/2 * - * The SM calls back a previously connected subsystem process to - * authorizes it to bootstrap (initialize). The SM connects to a - * named LPC port which name was sent in the connection data by the - * candidate subsystem server process. + * DESCRIPTION + * The SM calls back a previously connected subsystem process to + * authorize it to bootstrap (initialize). The SM connects to a + * named LPC port which name was sent in the connection data by + * the candidate subsystem server process. */ static NTSTATUS SmpCallbackServer (PSM_PORT_MESSAGE Request, @@ -72,7 +73,8 @@ DPRINT("SM: %s called\n", __FUNCTION__); - if(IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId) + if ( (IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) || + (IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId)) { DPRINT("SM: %s: we do not need calling back SM!\n", __FUNCTION__); @@ -210,12 +212,10 @@ { DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->SubSystemId); /* - * SmCreateClient/2 is called here explicitly to *fail*. - * If it succeeds, there is something wrong in the - * connection request. An environment subsystem *never* - * registers twice. (security issue) + * SmBeginClientInitialization/2 will succeed only if there + * is a candidate client ready. */ - Status = SmCreateClient (Request, & ClientData); + Status = SmBeginClientInitialization (Request, & ClientData); if(STATUS_SUCCESS == Status) { DPRINT("SM: %s: ClientData = 0x%08lx\n", @@ -310,7 +310,7 @@ * * DECRIPTION * Due to differences in LPC implementation between NT and ROS, - * we need a thread to listen for connection request that + * we need a thread to listen to for connection request that * creates a new thread for each connected port. This is not * necessary in NT LPC, because server side connected ports are * never used to receive requests. _____ Modified: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -34,16 +34,20 @@ */ SMAPI(SmCompSes) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("SM: %s called\n", __FUNCTION__); - - Status = SmCompleteClientInitialization (Request->Header.ClientId.UniqueProcess); - if(!NT_SUCCESS(Status)) + + DPRINT("SM: %s: ClientId.UniqueProcess=%lx\n", + __FUNCTION__, Request->Header.ClientId.UniqueProcess); + Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); + if (!NT_SUCCESS(Status)) { - Request->SmHeader.Status = STATUS_UNSUCCESSFUL; + DPRINT1("SM: %s: NtQueryInformationProcess failed (Status=0x%08lx)\n", + __FUNCTION__, Status); } - return Status; + Request->SmHeader.Status = Status; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -31,15 +31,27 @@ /********************************************************************** * SmCreateUserProcess/5 * + * DESCRIPTION + * + * ARGUMENTS + * ImagePath: bsolute path of the image to run; + * CommandLine: arguments and options for ImagePath; + * WaitForIt: TRUE for boot time processes and FALSE for + * subsystems bootstrapping; + * Timeout: optional: used if WaitForIt==TRUE; + * ProcessHandle: optional: a duplicated handle for + the child process (storage provided by the caller). + * + * RETURN VALUE + * NTSTATUS: + * */ NTSTATUS STDCALL SmCreateUserProcess (LPWSTR ImagePath, LPWSTR CommandLine, BOOLEAN WaitForIt, PLARGE_INTEGER Timeout OPTIONAL, - BOOLEAN TerminateIt, - PRTL_PROCESS_INFO UserProcessInfo OPTIONAL - ) + PRTL_PROCESS_INFO UserProcessInfo OPTIONAL) { UNICODE_STRING ImagePathString = {0}; UNICODE_STRING CommandLineString = {0}; @@ -48,9 +60,13 @@ PRTL_PROCESS_INFO pProcessInfo = & ProcessInfo; NTSTATUS Status = STATUS_SUCCESS; + DPRINT("SM: %s called\n", __FUNCTION__); + + if (NULL != UserProcessInfo) + { + pProcessInfo = UserProcessInfo; + } - DPRINT("SM: %s called\n",__FUNCTION__); - RtlInitUnicodeString (& ImagePathString, ImagePath); RtlInitUnicodeString (& CommandLineString, CommandLine); @@ -65,12 +81,6 @@ NULL, NULL); - if(NULL != UserProcessInfo) - { - /* Use caller provided storage */ - pProcessInfo = UserProcessInfo; - } - Status = RtlCreateUserProcess (& ImagePathString, OBJ_CASE_INSENSITIVE, ProcessParameters, @@ -82,7 +92,7 @@ NULL, pProcessInfo); - RtlDestroyProcessParameters (ProcessParameters); + RtlDestroyProcessParameters (ProcessParameters); if (!NT_SUCCESS(Status)) { @@ -90,25 +100,52 @@ __FUNCTION__, ImagePathString.Buffer, Status); return Status; } - - ZwResumeThread(pProcessInfo->ThreadHandle, NULL); - - - /* Wait for process termination */ - if(WaitForIt) + /* + * It the caller is *not* interested in the child info, + * resume it immediately. + */ + if (NULL == UserProcessInfo) { - NtWaitForSingleObject (pProcessInfo->ProcessHandle, - FALSE, - Timeout); + Status = NtResumeThread (ProcessInfo.ThreadHandle, NULL); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtResumeThread failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } } + else + { + HANDLE DupProcessHandle = (HANDLE) 0; + + Status = NtDuplicateObject (NtCurrentProcess(), + pProcessInfo->ProcessHandle, + NtCurrentProcess(), + & DupProcessHandle, + PROCESS_ALL_ACCESS, + 0, 0); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtDuplicateObject failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } + pProcessInfo->ProcessHandle = DupProcessHandle; + + } - /* Terminate process */ - if(TerminateIt) + /* Wait for process termination */ + if (WaitForIt) { - NtClose(pProcessInfo->ThreadHandle); - NtClose(pProcessInfo->ProcessHandle); + Status = NtWaitForSingleObject (pProcessInfo->ProcessHandle, + FALSE, + Timeout); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtWaitForSingleObject failed with Status=0x%08lx\n", + __FUNCTION__, Status); + } + } - return STATUS_SUCCESS; + return Status; } /********************************************************************** @@ -259,61 +296,94 @@ (ExecPgm->NameLength <= SM_EXEXPGM_MAX_LENGTH) && TRUE /* TODO: check LPC payload size */) { + WCHAR Data [MAX_PATH + 1] = {0}; + ULONG DataLength = sizeof Data; + ULONG DataType = REG_EXPAND_SZ; + RtlZeroMemory (Name, sizeof Name); RtlCopyMemory (Name, ExecPgm->Name, (sizeof ExecPgm->Name[0] * ExecPgm->NameLength)); DPRINT("SM: %s: Name='%S'\n", __FUNCTION__, Name); - /* - * Check if program name is internal - * (Is this correct? Debug is in the registry too) - */ - if(0 == _wcsicmp(L"DEBUG", Name)) + /* Lookup Name in the registry */ + Status = SmLookupSubsystem (Name, + Data, + & DataLength, + & DataType, + TRUE); /* expand */ + if(NT_SUCCESS(Status)) { - /* - * Initialize DBGSS. - * NOTE: probably in early prototypes it was an - * independent process; now it is embedded in the - * SM for performance or security. - */ - Request->SmHeader.Status = SmInitializeDbgSs(); - } - else - { - WCHAR Data [MAX_PATH + 1] = {0}; - ULONG DataLength = sizeof Data; - ULONG DataType = REG_EXPAND_SZ; - - /* Lookup Name in the registry */ - Status = SmLookupSubsystem (Name, - Data, - & DataLength, - & DataType, - TRUE); /* expand */ - if(NT_SUCCESS(Status)) + /* Is the subsystem definition non-empty? */ + if (DataLength > sizeof Data[0]) { WCHAR ImagePath [MAX_PATH + 1] = {0}; + PWCHAR CommandLine = ImagePath; + RTL_PROCESS_INFO ProcessInfo = {0}; wcscpy (ImagePath, L"\\??\\"); wcscat (ImagePath, Data); - - /* Create native process */ - Request->SmHeader.Status = SmCreateUserProcess(ImagePath, - L"", /* FIXME */ - FALSE, /* wait */ - NULL, - FALSE, /* terminate */ - NULL); - }else{ - Request->SmHeader.Status = Status; + /* + * Look for the beginning of the command line. + */ + for (; (*CommandLine != L'\0') && (*CommandLine != L' '); + CommandLine ++); + for (; *CommandLine == L' '; CommandLine ++) + { + *CommandLine = L'\0'; + } + /* + * Create a native process (suspended). + */ + ProcessInfo.Size = sizeof ProcessInfo; + Request->SmHeader.Status = + SmCreateUserProcess(ImagePath, + CommandLine, + FALSE, /* wait */ + NULL, /* timeout */ + & ProcessInfo); + if (NT_SUCCESS(Request->SmHeader.Status)) + { + Status = SmCreateClient (& ProcessInfo, Name); + if (NT_SUCCESS(Status)) + { + Status = NtResumeThread (ProcessInfo.ThreadHandle, NULL); + if (!NT_SUCCESS(Status)) + { + //Status = SmDestroyClient TODO + } + } else { + DPRINT1("SM: %s: SmCreateClient failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } + } } + else + { + /* + * OK, the definition is empty, but check + * if it is the name of an embedded subsystem. + */ + if(0 == _wcsicmp(L"DEBUG", Name)) + { + /* + * Initialize the embedded DBGSS. + */ + Request->SmHeader.Status = SmInitializeDbgSs(); + } + else + { + /* + * Badly defined subsystem. Check the registry! + */ + Request->SmHeader.Status = STATUS_NOT_FOUND; + } + } + } else { + /* It couldn't lookup the Name! */ + Request->SmHeader.Status = Status; } } - else - { - Request->SmHeader.Status = Status = STATUS_INVALID_PARAMETER; - } return Status; } _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/smss.c 2005-05-22 15:54:15 UTC (rev 15467) @@ -30,16 +30,18 @@ #define NDEBUG #include <debug.h> -HANDLE SmSsProcessId = 0; +ULONG SmSsProcessId = 0; /* Native image's entry point */ VOID STDCALL NtProcessStartup(PPEB Peb) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PROCESS_BASIC_INFORMATION PBI = {0}; +PrintString("*** EXPERIMENTAL ***\n"); + PrintString("ReactOS Session Manager %s (Build %s)\n", KERNEL_RELEASE_STR, KERNEL_VERSION_BUILD_STR); @@ -52,7 +54,7 @@ NULL); if(NT_SUCCESS(Status)) { - SmSsProcessId = PBI.UniqueProcessId; + SmSsProcessId = (ULONG) PBI.UniqueProcessId; } /* Initialize the system */ Status = InitSessionManager(); _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-05-22 12:29:10 UTC (rev 15466) +++ trunk/reactos/subsys/smss/smss.h 2005-05-22 15:54:15 UTC (rev 15467) @@ -6,11 +6,8 @@ #include <sm/api.h> #include <sm/helper.h> -#define CHILD_CSRSS 0 -#define CHILD_WINLOGON 1 - /* smss.c */ -extern HANDLE SmSsProcessId; +extern ULONG SmSsProcessId; /* init.c */ NTSTATUS InitSessionManager(VOID); @@ -63,8 +60,7 @@ LPWSTR CommandLine, BOOLEAN WaitForIt, PLARGE_INTEGER Timeout OPTIONAL, - BOOLEAN TerminateIt, - PRTL_PROCESS_INFO ProcessInfo OPTIONAL); + PRTL_PROCESS_INFO UserProcessInfo OPTIONAL); NTSTATUS STDCALL SmLookupSubsystem (IN PWSTR Name, IN OUT PWSTR Data, @@ -80,22 +76,30 @@ NTSTATUS FASTCALL SmQryInfo(PSM_PORT_MESSAGE); /* client.c */ +#define SM_CLIENT_FLAG_CANDIDATE 0x8000 +#define SM_CLIENT_FLAG_INITIALIZED 0x0001 +#define SM_CLIENT_FLAG_REQUIRED 0x0002 typedef struct _SM_CLIENT_DATA { - USHORT SubsystemId; - BOOL Initialized; - HANDLE ServerProcess; - HANDLE ApiPort; - HANDLE ApiPortThread; - HANDLE SbApiPort; - WCHAR SbApiPortName [SM_SB_NAME_MAX_LENGTH]; - struct _SM_CLIENT_DATA * Next; + RTL_CRITICAL_SECTION Lock; + WCHAR ProgramName [SM_SB_NAME_MAX_LENGTH]; + USHORT SubsystemId; + WORD Flags; [truncated at 1000 lines; 22 more skipped]

19 years, 4 months

[jimtabor] 15466: This is a CompareStringW hack to get (7z313.exe /Q) to install. If anyone else has a better way, go for it!

by jimtabor＠svn.reactos.com

This is a CompareStringW hack to get (7z313.exe /Q) to install. If anyone else has a better way, go for it! Modified: trunk/reactos/lib/kernel32/misc/lang.c _____ Modified: trunk/reactos/lib/kernel32/misc/lang.c --- trunk/reactos/lib/kernel32/misc/lang.c 2005-05-21 19:00:42 UTC (rev 15465) +++ trunk/reactos/lib/kernel32/misc/lang.c 2005-05-22 12:29:10 UTC (rev 15466) @@ -25,7 +25,6 @@ //static RTL_CRITICAL_SECTION LocalesListLock; - /*********************************************************************** ******* * @implemented * RIPPED FROM WINE's dlls\kernel\locale.c rev 1.42 @@ -849,6 +848,85 @@ } +static int compare_unicode_string( + PUNICODE_STRING String1, + PUNICODE_STRING String2, + DWORD Flags + ) +{ + ULONG len1, len2; + PWCHAR s1, s2; + WCHAR c1, c2; + + if (String1 && String2) + { + len1 = String1->Length / sizeof(WCHAR); + len2 = String2->Length / sizeof(WCHAR); + s1 = String1->Buffer; + s2 = String2->Buffer; + + while (len1 > 0 && len2 > 0) + { + if (Flags & NORM_IGNORESYMBOLS) + { + int skip = 0; + /* FIXME: not tested */ + if (iswctype(*s1, _SPACE | _PUNCT)) + { + s1++; + len1--; + skip = 1; + } + if (iswctype(*s2, _SPACE | _PUNCT)) + { + s2++; + len2--; + skip = 1; + } + if (skip) continue; + } + + /* hyphen and apostrophe are treated differently depending on + * whether SORT_STRINGSORT specified or not + */ + if (!(Flags & SORT_STRINGSORT)) + { + if (*s1 == '-' || *s1 == '\'') + { + if (*s2 != '-' && *s2 != '\'') + { + s1++; + len1--; + continue; + } + } + else if (*s2 == '-' || *s2 == '\'') + { + s2++; + len2--; + continue; + } + } + if (Flags & NORM_IGNORECASE) + { + c1 = len1-- ? RtlUpcaseUnicodeChar(*s1++) : 0; + c2 = len2-- ? RtlUpcaseUnicodeChar(*s2++) : 0; + if (!c1 || !c2 || c1 != c2) + return c1 - c2; + } + else + { + c1 = len1-- ? *s1++ : 0; + c2 = len2-- ? *s2++ : 0; + if (!c1 || !c2 || c1 != c2) + return c1 - c2; + } + } + } + return 0; +} + + /* * @unimplemented */ @@ -880,12 +958,6 @@ return 0; } - if (dwCmpFlags & ~NORM_IGNORECASE) - { - DPRINT1("CompareString: STUB flags - 0x%x\n", - dwCmpFlags & ~NORM_IGNORECASE); - } - if (cchCount1 < 0) cchCount1 = lstrlenW(lpString1); if (cchCount2 < 0) cchCount2 = lstrlenW(lpString2); @@ -894,9 +966,17 @@ String2.Length = String2.MaximumLength = cchCount2 * sizeof(WCHAR); String2.Buffer = (LPWSTR)lpString2; - Result = RtlCompareUnicodeString( - &String1, &String2, dwCmpFlags & NORM_IGNORECASE); + if (dwCmpFlags & ~NORM_IGNORECASE) + { + DPRINT1("CompareString: STUB flags - 0x%x\n", dwCmpFlags); + Result = compare_unicode_string(&String1, &String2, dwCmpFlags); + } + else + Result = RtlCompareUnicodeString( + &String1, &String2, dwCmpFlags & NORM_IGNORECASE); + + if (Result) /* need to translate result */ return (Result < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;

19 years, 4 months

[ekohl] 15465: IoRegisterDeviceInterface: Create nested keys one-by-one.

by ekohl＠svn.reactos.com

IoRegisterDeviceInterface: Create nested keys one-by-one. Modified: trunk/reactos/ntoskrnl/io/deviface.c _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-05-21 17:49:58 UTC (rev 15464) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-05-21 19:00:42 UTC (rev 15465) @@ -573,11 +573,13 @@ PUNICODE_STRING InstancePath; UNICODE_STRING GuidString; UNICODE_STRING SubKeyName; + UNICODE_STRING InterfaceKeyName; UNICODE_STRING BaseKeyName; UCHAR PdoNameInfoBuffer[sizeof(OBJECT_NAME_INFORMATION) + (256 * sizeof(WCHAR))]; POBJECT_NAME_INFORMATION PdoNameInfo = (POBJECT_NAME_INFORMATION)PdoNameInfoBuffer; UNICODE_STRING DeviceInstance = RTL_CONSTANT_STRING(L"DeviceInstance"); UNICODE_STRING SymbolicLink = RTL_CONSTANT_STRING(L"SymbolicLink"); + HANDLE ClassKey; HANDLE InterfaceKey; HANDLE SubKey; ULONG StartIndex; @@ -611,15 +613,11 @@ } ASSERT(PdoNameInfo->Name.Length); - /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\DeviceClasses\{GUID}\##?#ACPI#PNP0501#1#{G UID} */ + /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ ASSERT(PhysicalDeviceObject->DeviceObjectExtension->DeviceNode); InstancePath = &PhysicalDeviceObject->DeviceObjectExtension->DeviceNode->InstancePath; BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); BaseKeyName.MaximumLength = BaseKeyName.Length - + GuidString.Length - + 5 * sizeof(WCHAR) /* 5 = size of \##?# */ - + InstancePath->Length - + sizeof(WCHAR) /* 1 = size of # */ + GuidString.Length; BaseKeyName.Buffer = ExAllocatePool( NonPagedPool, @@ -631,16 +629,6 @@ } wcscpy(BaseKeyName.Buffer, BaseKeyString); RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); - RtlAppendUnicodeToString(&BaseKeyName, L"\\##?#"); - StartIndex = BaseKeyName.Length / sizeof(WCHAR); - RtlAppendUnicodeStringToString(&BaseKeyName, InstancePath); - for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) - { - if (BaseKeyName.Buffer[StartIndex + i] == '\\') - BaseKeyName.Buffer[StartIndex + i] = '#'; - } - RtlAppendUnicodeToString(&BaseKeyName, L"#"); - RtlAppendUnicodeStringToString(&BaseKeyName, &GuidString); /* Create BaseKeyName key in registry */ InitializeObjectAttributes( @@ -651,6 +639,57 @@ NULL); /* SecurityDescriptor */ Status = ZwCreateKey( + &ClassKey, + KEY_WRITE, + &ObjectAttributes, + 0, /* TileIndex */ + NULL, /* Class */ + REG_OPTION_VOLATILE, + NULL); /* Disposition */ + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ExFreePool(BaseKeyName.Buffer); + return Status; + } + + /* Create key name for this interface: ##?#ACPI#PNP0501#1#{GUID} */ + InterfaceKeyName.Length = 0; + InterfaceKeyName.MaximumLength = + 4 * sizeof(WCHAR) + /* 4 = size of ##?# */ + InstancePath->Length + + sizeof(WCHAR) + /* 1 = size of # */ + GuidString.Length; + InterfaceKeyName.Buffer = ExAllocatePool( + NonPagedPool, + InterfaceKeyName.MaximumLength); + if (!InterfaceKeyName.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeToString(&InterfaceKeyName, L"##?#"); + StartIndex = InterfaceKeyName.Length / sizeof(WCHAR); + RtlAppendUnicodeStringToString(&InterfaceKeyName, InstancePath); + for (i = 0; i < InstancePath->Length / sizeof(WCHAR); i++) + { + if (InterfaceKeyName.Buffer[StartIndex + i] == '\\') + InterfaceKeyName.Buffer[StartIndex + i] = '#'; + } + RtlAppendUnicodeToString(&InterfaceKeyName, L"#"); + RtlAppendUnicodeStringToString(&InterfaceKeyName, &GuidString); + + /* Create the interface key in registry */ + InitializeObjectAttributes( + &ObjectAttributes, + &InterfaceKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, + ClassKey, + NULL); /* SecurityDescriptor */ + + Status = ZwCreateKey( &InterfaceKey, KEY_WRITE, &ObjectAttributes, @@ -662,6 +701,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + ZwClose(ClassKey); ExFreePool(BaseKeyName.Buffer); return Status; } @@ -678,6 +718,8 @@ { DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); return Status; } @@ -694,6 +736,8 @@ { DPRINT("ExAllocatePool() failed\n"); ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); return STATUS_INSUFFICIENT_RESOURCES; } @@ -722,6 +766,8 @@ { DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); ZwClose(InterfaceKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); return Status; } @@ -742,8 +788,10 @@ if (!SymbolicLinkName->Buffer) { DPRINT("ExAllocatePool() failed\n"); + ZwClose(SubKey); ZwClose(InterfaceKey); - ZwClose(SubKey); + ZwClose(ClassKey); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(SubKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); return STATUS_INSUFFICIENT_RESOURCES; @@ -771,9 +819,11 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); + ZwClose(SubKey); ZwClose(InterfaceKey); - ZwClose(SubKey); + ZwClose(ClassKey); ExFreePool(SubKeyName.Buffer); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); ExFreePool(SymbolicLinkName->Buffer); return Status; @@ -793,9 +843,11 @@ ExFreePool(SymbolicLinkName->Buffer); } + ZwClose(SubKey); ZwClose(InterfaceKey); - ZwClose(SubKey); + ZwClose(ClassKey); ExFreePool(SubKeyName.Buffer); + ExFreePool(InterfaceKeyName.Buffer); ExFreePool(BaseKeyName.Buffer); return Status;

19 years, 4 months

[ekohl] 15464: Add DeviceClasses key.

by ekohl＠svn.reactos.com

Add DeviceClasses key. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-21 17:26:59 UTC (rev 15463) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-21 17:49:58 UTC (rev 15464) @@ -46,6 +46,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName","Compu terName",0x00000002,"COMPUTERNAME" +; Device classes key +HKLM,"SYSTEM\CurrentControlSet\Control\DeviceClasses",,0x00000012 + ; Hardware profile settings HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x000 10001,0x00000000

19 years, 4 months

[fireball] 15463: Added russian translations for libs: mpr, msacm, msi, oledlg, shdocvw.

by fireball＠svn.reactos.com

Added russian translations for libs: mpr, msacm, msi, oledlg, shdocvw. Thanks to: Mikhail Zvyzdochkin, Dmitry Phlilippov. Modified: trunk/reactos/lib/mpr/mpr.rc Added: trunk/reactos/lib/mpr/mpr_Ru.rc Modified: trunk/reactos/lib/msacm/msacm.rc Added: trunk/reactos/lib/msacm/msacm_Ru.rc Modified: trunk/reactos/lib/msi/msi.rc Added: trunk/reactos/lib/msi/msi_Ru.rc Added: trunk/reactos/lib/oledlg/oledlg_Ru.rc Modified: trunk/reactos/lib/oledlg/rsrc.rc Added: trunk/reactos/lib/shdocvw/Ru.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.rc _____ Modified: trunk/reactos/lib/mpr/mpr.rc --- trunk/reactos/lib/mpr/mpr.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/mpr/mpr.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -33,4 +33,5 @@ #include "mpr_Ja.rc" #include "mpr_Nl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" #include "mpr_Sv.rc" _____ Added: trunk/reactos/lib/mpr/mpr_Ru.rc --- trunk/reactos/lib/mpr/mpr_Ru.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/mpr/mpr_Ru.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -0,0 +1,46 @@ +/* + * MPR dll resources + * + * Copyright (C) 2005 Mikhail Y. Zvyozdochkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "?± ±Õ?³" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?ÔÕõÞ?Õ ÐÕ?ÕÔ¯Ú ¤Ó¯Ù³" +FONT 8, "MS Shell Dlg" +{ + LTEXT "¤¯µÓÙ¾Ú±?Ó, ÔÔÕõÞ?Õ ?Ó°Þ Þý Þ ´Ó¯Ù³:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "¤¯Û±Þ-±ÕÔÕ", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "?ý ´¯Ù³þ¯ÔÓ?ÕÙ ", -1, 40, 66, 50, 10 + LTEXT "¤Ó¯Ù³", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Ð¯§ÓÝÞ?³ ´Ó¯Ù³ (ÝÕßÕþ¯´Ó±Ý¯)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} _____ Modified: trunk/reactos/lib/msacm/msacm.rc --- trunk/reactos/lib/msacm/msacm.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/msacm/msacm.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -30,4 +30,5 @@ #include "msacm_Ja.rc" #include "msacm_Nl.rc" #include "msacm_Pt.rc" +#include "msacm_Ru.rc" #include "msacm_Sv.rc" _____ Added: trunk/reactos/lib/msacm/msacm_Ru.rc --- trunk/reactos/lib/msacm/msacm_Ru.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/msacm/msacm_Ru.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -0,0 +1,57 @@ +/* + * Russian resource file for MS ACM + * + * Copyright 2005 Mikhail Y. Zvyozdochkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?¹ß¯ þÔ¾ÛÓ" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&?ý :", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "Ð¯§&ÓÝÞ?³ ÛÓÛ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&ËõÓÙÞ?³", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&È¯ýÓ?:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&ÐÔ¯Ú±?ÔÓ:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "Ð&´ÓÔÛÓ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + _____ Modified: trunk/reactos/lib/msi/msi.rc --- trunk/reactos/lib/msi/msi.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/msi/msi.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -33,3 +33,4 @@ #include "msi_Fr.rc" #include "msi_Nl.rc" #include "msi_Pt.rc" +#include "msi_Ru.rc" _____ Added: trunk/reactos/lib/msi/msi_Ru.rc --- trunk/reactos/lib/msi/msi_Ru.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/msi/msi_Ru.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -0,0 +1,34 @@ +/* + * Russian resources for MSI + * + * Copyright 2005 Mikhail Y. Zvyozdochkin + * Aleksey Bragin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 5 "´¾?³ %s ÝÕ ÝÓÚõÕÝ" + 9 "Ô±?ÓÔ³?Õ õÞ±Û %s" + 10 "ÝÕÔÕÝ¹Õ ´ÓÓýÕ?¹" + 11 "ÔÔÕõÞ?Õ, ÛÓÛÓ ´Ó´ÛÓ ±¯õÕµÞ? %s" + 12 "ÝÕõ¯±?¾´ÕÝ Þ±?¯¸ÝÞÛ ¾±?ÓÝ¯ÔÛÞ (±·ÕýÝ¹Ú ÞÙÞ Û¯ý´ÓÛ?-õÞ±Û ÝÕÔ± ?ÓÔÙÕÝ Ô õÞ±Û¯Ô¯õ)" + 13 "ÝÕõ¯±?¾´ÕÝ ±Õ?ÕÔ¯Ú õÞ±Û, ±¯õÕµÓ¨ÞÚ ÝÕ¯ß§¯õÞý¹Ú ¶ÓÚÙ" + 14 "¶¾ÝÛ÷Þ¯ÝÓÙ³Ý¯±?³ Þþ:" + 15 "Ô¹ßÕÞ?Õ, ÛÓÛÓ ´Ó´ÛÓ ±¯õÕµÞ? %s" +} _____ Added: trunk/reactos/lib/oledlg/oledlg_Ru.rc --- trunk/reactos/lib/oledlg/oledlg_Ru.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/oledlg/oledlg_Ru.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -0,0 +1,56 @@ +/* + * Copyright 2005 Mikhail Y. Zvyozdochkin + * Aleksey Bragin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "?±?ÓÔÛÓ ¯ß·ÕÛ?Ó" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "ÊÞ´ ¯ß·ÕÛ?Ó:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "??ýÕÝÓ",IDCANCEL,221,24,66,14 + GROUPBOX "ðÕþ¾Ù³?Ó?",IDC_RESULT,7,103,208,41 + CONTROL "Ð¯þõÓ?³ Ý¯Ô¹Ú",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Ð¯þõÓ?³ ²ÙÕýÕÝ? ¾´ÓÔÙÕÝÞ ",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Ð¯þõÓ?³ Þþ ¶ÓÚÙÓ",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&?¯ßÓÔÞ?³ ²ÙÕýÕÝ? ¾´ÓÔÙÕÝÞ ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "??¯ßÓµÓ?³ Ô ÔÞõÕ þÝÓ¸ÛÓ",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "?ßþ¯...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "ÈÓÚÙ:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "?±?ÓÔÞ?³ Ý¯Ô¹Ú ¯ß·ÕÛ? %s Ô ?Ó° õ¯Û¾ýÕÝ?" + IDS_RESULTFILEOBJDESC "?±?ÓÔÞ?³ ±¯õÕµÞý¯Õ ¶ÓÚÙÓ ÛÓÛ ¯ß·ÕÛ? Ô ?Ó° õ¯Û¾ýÕÝ? ?ÓÛ, ¸?¯ ?¹ ý¯µÕ?Õ Óß¯?Ó?³ ± ÝÞý, Þ±´¯Ù³þ¾ ?¾ ´¯ÒÓýý¾, Û¯?¯¯Ú ¯Ý ±¯þõÓÝ." + IDS_BROWSE "?ßþ¯" + IDS_NOTOLEMOD "ÈÓÚÙ ÝÕ ÔÙ Õ?± Û¯ÕÛ?Ý¹ý ý¯õ¾ÙÕý OLE. ?Õ Ô¯þý¯µÝ¯ þÓÕÒÞ±?Þ¯ÔÓ?³ ²ÙÕýÕÝ? ¾´ÓÔÙÕÝÞ OLE." + IDS_NOTOLEMODCAPTION "?¯ßÓÔÙ Õ? ²ÙÕýÕÝ? ¾´ÓÔÙÕÝÞ " +} _____ Modified: trunk/reactos/lib/oledlg/rsrc.rc --- trunk/reactos/lib/oledlg/rsrc.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/oledlg/rsrc.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -40,3 +40,4 @@ #include "oledlg_Ja.rc" #include "oledlg_Nl.rc" #include "oledlg_Pt.rc" +#include "oledlg_Ru.rc" _____ Added: trunk/reactos/lib/shdocvw/Ru.rc --- trunk/reactos/lib/shdocvw/Ru.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/shdocvw/Ru.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -0,0 +1,37 @@ +/* + * Copyright 2005 Mikhail Y. Zvyozdochkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÃÓÒ¾þÛÓ ²ÙÕýÕÝ?Ó ¾´ÓÔÙÕÝÞ Mozilla Active X" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "??ýÕÝÓ", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "¤ÞÙ¯µÕÝÞÕ þÓ´Ó°ÞÔÓÕ? ActiveX-¯ß·ÕÛ? ¯ß¯þÕÔÓ?ÕÙ ,\n" \ + "¯õÝÓÛ¯ ²ÙÕýÕÝ? ¾´ÓÔÙÕÝÞ Mozilla ActiveX ÝÕ¾±?ÓÝ¯ÔÙÕÝ." \ + "i¯?Þ?Õ þÓÒ¾þÞ?³ Þ ¾±?ÓÝ¯ÔÞ?³ ÕÒ¯?" +END + _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.rc --- trunk/reactos/lib/shdocvw/shdocvw.rc 2005-05-21 17:05:38 UTC (rev 15462) +++ trunk/reactos/lib/shdocvw/shdocvw.rc 2005-05-21 17:26:59 UTC (rev 15463) @@ -29,4 +29,5 @@ #include "Fr.rc" #include "Nl.rc" #include "Pt.rc" +#include "Ru.rc" #include "Sv.rc"

19 years, 4 months

[hbirr] 15462: Set STATUS_SUCCESS instead of STATUS_PIPE_CONNECTED in NpfsSignalAndRemoveListeningServerInstance.

by hbirr＠svn.reactos.com

Set STATUS_SUCCESS instead of STATUS_PIPE_CONNECTED in NpfsSignalAndRemoveListeningServerInstance. Modified: trunk/reactos/drivers/fs/np/create.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-05-21 17:02:38 UTC (rev 15461) +++ trunk/reactos/drivers/fs/np/create.c 2005-05-21 17:05:38 UTC (rev 15462) @@ -96,7 +96,7 @@ RemoveEntryList(&Waiter->Entry); Irp = CONTAINING_RECORD(Waiter, IRP, Tail.Overlay.DriverContext); - Irp->IoStatus.Status = STATUS_PIPE_CONNECTED; + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); break;

19 years, 4 months

[hbirr] 15461: Revert to rev 15172.

by hbirr＠svn.reactos.com

Revert to rev 15172. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 16:45:50 UTC (rev 15460) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-21 17:02:38 UTC (rev 15461) @@ -324,8 +324,7 @@ 0); /* return FALSE in case of failure and pending operations! */ - if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) || - Status == STATUS_PENDING) + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) { SetLastErrorByStatus(Status); return FALSE; @@ -358,7 +357,7 @@ } } - if (!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); return FALSE;

19 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005