Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

by ea＠svn.reactos.com

svn: eol-style + keywords Modified: trunk/reactos/lib/ntdll/csr/api.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/ntdll/csr/api.c --- trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,89 +1,90 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/api.c - * PURPOSE: CSR APIs exported through NTDLL - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ -extern HANDLE CsrApiPort; - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrNewThread(VOID) -{ - /* Register the termination port to CSR's */ - return NtRegisterThreadTerminatePort(CsrApiPort); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrSetPriorityClass(HANDLE hProcess, - PULONG PriorityClass) -{ - NTSTATUS Status; - CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ - PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass; - - /* Set up the data for CSR */ - DbgBreakPoint(); - SetPriorityClass->hProcess = hProcess; - SetPriorityClass->PriorityClass = *PriorityClass; - - /* Call it */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, - CSR_SRV_SERVER), - sizeof(CSR_SET_PRIORITY_CLASS)); - - /* Return what we got, if requested */ - if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; - - /* Return to caller */ - return Status; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrIdentifyAlertableThread (VOID) -{ - NTSTATUS Status; - CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ - PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - - /* Set up the data for CSR */ - DbgBreakPoint(); - IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; - IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; - - /* Call it */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, - CSR_SRV_SERVER), - sizeof(CSR_SET_PRIORITY_CLASS)); - - /* Return to caller */ - return Status; -} - -/* EOF */ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/csr/api.c + * PURPOSE: CSR APIs exported through NTDLL + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ +extern HANDLE CsrApiPort; + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrNewThread(VOID) +{ + /* Register the termination port to CSR's */ + return NtRegisterThreadTerminatePort(CsrApiPort); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrSetPriorityClass(HANDLE hProcess, + PULONG PriorityClass) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass; + + /* Set up the data for CSR */ + DbgBreakPoint(); + SetPriorityClass->hProcess = hProcess; + SetPriorityClass->PriorityClass = *PriorityClass; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return what we got, if requested */ + if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; + + /* Return to caller */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrIdentifyAlertableThread (VOID) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + + /* Set up the data for CSR */ + DbgBreakPoint(); + IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; + IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return to caller */ + return Status; +} + +/* EOF */ Property changes on: trunk/reactos/lib/ntdll/csr/api.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:36:27 UTC (rev 18050) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:43:33 UTC (rev 18051) @@ -1,437 +1,438 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/csr/connect.c - * PURPOSE: Routines for connecting and calling CSR - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -HANDLE CsrApiPort; -HANDLE CsrProcessId; -HANDLE CsrPortHeap; -ULONG_PTR CsrPortMemoryDelta; -BOOLEAN InsideCsrProcess = FALSE; -BOOLEAN UsingOldCsr = TRUE; - -typedef NTSTATUS -(NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, - IN PPORT_MESSAGE Reply); - -PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; - -#define UNICODE_PATH_SEP L"\\" -#define CSR_PORT_NAME L"ApiPort" - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -HANDLE -NTAPI -CsrGetProcessId(VOID) -{ - return CsrProcessId; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, - PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - CSR_API_NUMBER ApiNumber, - ULONG RequestLength) -{ - NTSTATUS Status; - ULONG PointerCount; - PULONG_PTR Pointers; - ULONG_PTR CurrentPointer; - DPRINT("CsrClientCallServer\n"); - - /* Fill out the Port Message Header */ - ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - ApiMessage->Header.u1.s1.TotalLength = RequestLength; - - /* Fill out the CSR Header */ - ApiMessage->Type = ApiNumber; - //ApiMessage->Opcode = ApiNumber; <- Activate with new CSR - ApiMessage->CsrCaptureData = NULL; - - DPRINT("API: %x, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", - ApiNumber, - ApiMessage->Header.u1.s1.DataLength, - ApiMessage->Header.u1.s1.TotalLength); - - /* Check if we are already inside a CSR Server */ - if (!InsideCsrProcess) - { - /* Check if we got a a Capture Buffer */ - if (CaptureBuffer) - { - /* We have to convert from our local view to the remote view */ - DPRINT1("Converting CaptureBuffer\n"); - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + - CsrPortMemoryDelta); - - /* Lock the buffer */ - CaptureBuffer->BufferEnd = 0; - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - while (PointerCount--) - { - /* Get this pointer and check if it's valid */ - if ((CurrentPointer = *Pointers++)) - { - /* Update it */ - *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; - Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; - } - } - } - - /* Send the LPC Message */ - Status = NtRequestWaitReplyPort(CsrApiPort, - &ApiMessage->Header, - &ApiMessage->Header); - - /* Check if we got a a Capture Buffer */ - if (CaptureBuffer) - { - /* We have to convert from the remote view to our remote view */ - DPRINT1("Reconverting CaptureBuffer\n"); - ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) - ApiMessage->CsrCaptureData - - CsrPortMemoryDelta); - - /* Get the pointer information */ - PointerCount = CaptureBuffer->PointerCount; - Pointers = CaptureBuffer->PointerArray; - - /* Loop through every pointer and convert it */ - while (PointerCount--) - { - /* Get this pointer and check if it's valid */ - if ((CurrentPointer = *Pointers++)) - { - /* Update it */ - CurrentPointer += (ULONG_PTR)ApiMessage; - Pointers[-1] = CurrentPointer; - *(PULONG_PTR)CurrentPointer -= CsrPortMemoryDelta; - } - } - } - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure */ - DPRINT1("LPC Failed: %lx\n", Status); - ApiMessage->Status = Status; - } - } - else - { - /* This is a server-to-server call. Save our CID and do a direct call */ - DbgBreakPoint(); - ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; - Status = CsrServerApiRoutine(&ApiMessage->Header, - &ApiMessage->Header); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed. Overwrite the return value with the failure */ - ApiMessage->Status = Status; - } - } - - /* Return the CSR Result */ - DPRINT("Got back: %x\n", ApiMessage->Status); - return ApiMessage->Status; -} - -NTSTATUS -NTAPI -CsrConnectToServer(IN PWSTR ObjectDirectory) -{ - ULONG PortNameLength; - UNICODE_STRING PortName; - LARGE_INTEGER CsrSectionViewSize; - NTSTATUS Status; - HANDLE CsrSectionHandle; - PORT_VIEW LpcWrite; - REMOTE_PORT_VIEW LpcRead; - SECURITY_QUALITY_OF_SERVICE SecurityQos; - SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; - PSID SystemSid = NULL; - CSR_CONNECTION_INFO ConnectionInfo; - ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); - - DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); - - /* Binary compatibility with MS KERNEL32 */ - if (NULL == ObjectDirectory) - { - ObjectDirectory = L"\\Windows"; - } - - /* Calculate the total port name size */ - PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + - sizeof(CSR_PORT_NAME); - - /* Set the port name */ - PortName.Length = 0; - PortName.MaximumLength = PortNameLength; - - /* Allocate a buffer for it */ - PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); - - /* Create the name */ - RtlAppendUnicodeToString(&PortName, ObjectDirectory ); - RtlAppendUnicodeToString(&PortName, UNICODE_PATH_SEP); - RtlAppendUnicodeToString(&PortName, CSR_PORT_NAME); - - /* Create a section for the port memory */ - CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE; - Status = NtCreateSection(&CsrSectionHandle, - SECTION_ALL_ACCESS, - NULL, - &CsrSectionViewSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure allocating CSR Section\n"); - return Status; - } - - /* Set up the port view structures to match them with the section */ - LpcWrite.Length = sizeof(PORT_VIEW); - LpcWrite.SectionHandle = CsrSectionHandle; - LpcWrite.SectionOffset = 0; - LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart; - LpcWrite.ViewBase = 0; - LpcWrite.ViewRemoteBase = 0; - LpcRead.Length = sizeof(REMOTE_PORT_VIEW); - LpcRead.ViewSize = 0; - LpcRead.ViewBase = 0; - - /* Setup the QoS */ - SecurityQos.ImpersonationLevel = SecurityImpersonation; - SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; - SecurityQos.EffectiveOnly = TRUE; - - /* Setup the connection info */ - ConnectionInfo.Version = 0x10000; - - /* Create a SID for us */ - Status = RtlAllocateAndInitializeSid(&NtSidAuthority, - 1, - SECURITY_LOCAL_SYSTEM_RID, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - &SystemSid); - - /* Connect to the port */ - Status = NtSecureConnectPort(&CsrApiPort, - &PortName, - &SecurityQos, - &LpcWrite, - SystemSid, - &LpcRead, - NULL, - &ConnectionInfo, - &ConnectionInfoLength); - NtClose(CsrSectionHandle); - if (!NT_SUCCESS(Status)) - { - /* Failure */ - DPRINT1("Couldn't connect to CSR port\n"); - return Status; - } - - /* Save the delta between the sections, for capture usage later */ - CsrPortMemoryDelta = (ULONG_PTR)LpcWrite.ViewRemoteBase - - (ULONG_PTR)LpcWrite.ViewBase; - - /* Save the Process */ - CsrProcessId = ConnectionInfo.ProcessId; - - /* Save CSR Section data */ - NtCurrentPeb()->ReadOnlySharedMemoryBase = ConnectionInfo.SharedSectionBase; - NtCurrentPeb()->ReadOnlySharedMemoryHeap = ConnectionInfo.SharedSectionHeap; - NtCurrentPeb()->ReadOnlyStaticServerData = ConnectionInfo.SharedSectionData; - - /* Create the port heap */ - CsrPortHeap = RtlCreateHeap(0, - LpcWrite.ViewBase, - LpcWrite.ViewSize, - PAGE_SIZE, - 0, - 0); - - /* Return success */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -CsrClientConnectToServer(PWSTR ObjectDirectory, - ULONG ServerId, - PVOID ConnectionInfo, - PULONG ConnectionInfoSize, - PBOOLEAN ServerToServerCall) -{ - NTSTATUS Status; - PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING CsrSrvName; - HANDLE hCsrSrv; - ANSI_STRING CsrServerRoutineName; - PCSR_CAPTURE_BUFFER CaptureBuffer; - CSR_API_MESSAGE RosApiMessage; - CSR_API_MESSAGE2 ApiMessage; - PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.ClientConnect; - - /* Validate the Connection Info */ - DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); - if (ConnectionInfo && (!ConnectionInfoSize || !*ConnectionInfoSize)) - { - DPRINT1("Connection info given, but no length\n"); - return STATUS_INVALID_PARAMETER; - } - - /* Check if we're inside a CSR Process */ - if (InsideCsrProcess) - { - /* Tell the client that we're already inside CSR */ - if (ServerToServerCall) *ServerToServerCall = TRUE; - return STATUS_SUCCESS; - } - - /* - * We might be in a CSR Process but not know it, if this is the first call. - * So let's find out. - */ - if (!(NtHeader = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress))) - { - /* The image isn't valid */ - DPRINT1("Invalid image\n"); - return STATUS_INVALID_IMAGE_FORMAT; - } - InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE); - - /* Now we can check if we are inside or not */ - if (InsideCsrProcess && !UsingOldCsr) - { - /* We're inside, so let's find csrsrv */ - DbgBreakPoint(); - RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); - Status = LdrGetDllHandle(NULL, - NULL, - &CsrSrvName, - &hCsrSrv); - RtlFreeUnicodeString(&CsrSrvName); - - /* Now get the Server to Server routine */ - RtlInitAnsiString(&CsrServerRoutineName, "CsrCallServerFromServer"); - Status = LdrGetProcedureAddress(hCsrSrv, - &CsrServerRoutineName, - 0L, - (PVOID*)&CsrServerApiRoutine); - - /* Use the local heap as port heap */ - CsrPortHeap = RtlGetProcessHeap(); - - /* Tell the caller we're inside the server */ - *ServerToServerCall = InsideCsrProcess; - return STATUS_SUCCESS; - } - - /* Now check if connection info is given */ - if (ConnectionInfo) - { - /* Well, we're defintely in a client now */ - InsideCsrProcess = FALSE; - - /* Do we have a connection to CSR yet? */ - if (!CsrApiPort) - { - /* No, set it up now */ - if (!NT_SUCCESS(Status = CsrConnectToServer(ObjectDirectory))) - { - /* Failed */ - DPRINT1("Failure to connect to CSR\n"); - return Status; - } - } - - /* Setup the connect message header */ - ClientConnect->ServerId = ServerId; - ClientConnect->ConnectionInfoSize = *ConnectionInfoSize; - - /* Setup a buffer for the connection info */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, - ClientConnect->ConnectionInfoSize); - - /* Allocate a pointer for the connection info*/ - CsrAllocateMessagePointer(CaptureBuffer, - ClientConnect->ConnectionInfoSize, - &ClientConnect->ConnectionInfo); - - /* Copy the data into the buffer */ - RtlMoveMemory(ClientConnect->ConnectionInfo, - ConnectionInfo, - ClientConnect->ConnectionInfoSize); - - /* Return the allocated length */ - *ConnectionInfoSize = ClientConnect->ConnectionInfoSize; - - /* Call CSR */ -#if 0 - Status = CsrClientCallServer(&ApiMessage, - CaptureBuffer, - CSR_MAKE_OPCODE(CsrSrvClientConnect, - CSR_SRV_DLL), - sizeof(CSR_CLIENT_CONNECT)); -#endif - Status = CsrClientCallServer(&RosApiMessage, - NULL, - MAKE_CSR_API(CONNECT_PROCESS, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); - } - else - { - /* No connection info, just return */ - Status = STATUS_SUCCESS; - } - - /* Let the caller know if this was server to server */ - DPRINT("Status was: %lx. Are we in server: %lx\n", Status, InsideCsrProcess); - if (ServerToServerCall) *ServerToServerCall = InsideCsrProcess; - return Status; -} - -/* EOF */ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/csr/connect.c + * PURPOSE: Routines for connecting and calling CSR + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +HANDLE CsrApiPort; +HANDLE CsrProcessId; +HANDLE CsrPortHeap; +ULONG_PTR CsrPortMemoryDelta; +BOOLEAN InsideCsrProcess = FALSE; +BOOLEAN UsingOldCsr = TRUE; + +typedef NTSTATUS +(NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, + IN PPORT_MESSAGE Reply); + +PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; + +#define UNICODE_PATH_SEP L"\\" +#define CSR_PORT_NAME L"ApiPort" + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +HANDLE +NTAPI +CsrGetProcessId(VOID) +{ + return CsrProcessId; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, + PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + CSR_API_NUMBER ApiNumber, + ULONG RequestLength) +{ + NTSTATUS Status; + ULONG PointerCount; + PULONG_PTR Pointers; + ULONG_PTR CurrentPointer; + DPRINT("CsrClientCallServer\n"); + + /* Fill out the Port Message Header */ + ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); + ApiMessage->Header.u1.s1.TotalLength = RequestLength; + + /* Fill out the CSR Header */ + ApiMessage->Type = ApiNumber; + //ApiMessage->Opcode = ApiNumber; <- Activate with new CSR + ApiMessage->CsrCaptureData = NULL; + + DPRINT("API: %x, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + ApiNumber, + ApiMessage->Header.u1.s1.DataLength, + ApiMessage->Header.u1.s1.TotalLength); + + /* Check if we are already inside a CSR Server */ + if (!InsideCsrProcess) + { + /* Check if we got a a Capture Buffer */ + if (CaptureBuffer) + { + /* We have to convert from our local view to the remote view */ + DPRINT1("Converting CaptureBuffer\n"); + ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + + CsrPortMemoryDelta); + + /* Lock the buffer */ + CaptureBuffer->BufferEnd = 0; + + /* Get the pointer information */ + PointerCount = CaptureBuffer->PointerCount; + Pointers = CaptureBuffer->PointerArray; + + /* Loop through every pointer and convert it */ + while (PointerCount--) + { + /* Get this pointer and check if it's valid */ + if ((CurrentPointer = *Pointers++)) + { + /* Update it */ + *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; + Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; + } + } + } + + /* Send the LPC Message */ + Status = NtRequestWaitReplyPort(CsrApiPort, + &ApiMessage->Header, + &ApiMessage->Header); + + /* Check if we got a a Capture Buffer */ + if (CaptureBuffer) + { + /* We have to convert from the remote view to our remote view */ + DPRINT1("Reconverting CaptureBuffer\n"); + ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) + ApiMessage->CsrCaptureData - + CsrPortMemoryDelta); + + /* Get the pointer information */ + PointerCount = CaptureBuffer->PointerCount; + Pointers = CaptureBuffer->PointerArray; + + /* Loop through every pointer and convert it */ + while (PointerCount--) + { + /* Get this pointer and check if it's valid */ + if ((CurrentPointer = *Pointers++)) + { + /* Update it */ + CurrentPointer += (ULONG_PTR)ApiMessage; + Pointers[-1] = CurrentPointer; + *(PULONG_PTR)CurrentPointer -= CsrPortMemoryDelta; + } + } + } + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure */ + DPRINT1("LPC Failed: %lx\n", Status); + ApiMessage->Status = Status; + } + } + else + { + /* This is a server-to-server call. Save our CID and do a direct call */ + DbgBreakPoint(); + ApiMessage->Header.ClientId = NtCurrentTeb()->Cid; + Status = CsrServerApiRoutine(&ApiMessage->Header, + &ApiMessage->Header); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure */ + ApiMessage->Status = Status; + } + } + + /* Return the CSR Result */ + DPRINT("Got back: %x\n", ApiMessage->Status); + return ApiMessage->Status; +} + +NTSTATUS +NTAPI +CsrConnectToServer(IN PWSTR ObjectDirectory) +{ + ULONG PortNameLength; + UNICODE_STRING PortName; + LARGE_INTEGER CsrSectionViewSize; + NTSTATUS Status; + HANDLE CsrSectionHandle; + PORT_VIEW LpcWrite; + REMOTE_PORT_VIEW LpcRead; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + PSID SystemSid = NULL; + CSR_CONNECTION_INFO ConnectionInfo; + ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); + + DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); + + /* Binary compatibility with MS KERNEL32 */ + if (NULL == ObjectDirectory) + { + ObjectDirectory = L"\\Windows"; + } + + /* Calculate the total port name size */ + PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + + sizeof(CSR_PORT_NAME); + + /* Set the port name */ + PortName.Length = 0; + PortName.MaximumLength = PortNameLength; + + /* Allocate a buffer for it */ + PortName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PortNameLength); + + /* Create the name */ + RtlAppendUnicodeToString(&PortName, ObjectDirectory ); + RtlAppendUnicodeToString(&PortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&PortName, CSR_PORT_NAME); + + /* Create a section for the port memory */ + CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE; + Status = NtCreateSection(&CsrSectionHandle, + SECTION_ALL_ACCESS, + NULL, + &CsrSectionViewSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure allocating CSR Section\n"); + return Status; + } + + /* Set up the port view structures to match them with the section */ + LpcWrite.Length = sizeof(PORT_VIEW); + LpcWrite.SectionHandle = CsrSectionHandle; + LpcWrite.SectionOffset = 0; + LpcWrite.ViewSize = CsrSectionViewSize.u.LowPart; + LpcWrite.ViewBase = 0; + LpcWrite.ViewRemoteBase = 0; + LpcRead.Length = sizeof(REMOTE_PORT_VIEW); + LpcRead.ViewSize = 0; + LpcRead.ViewBase = 0; + + /* Setup the QoS */ + SecurityQos.ImpersonationLevel = SecurityImpersonation; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + /* Setup the connection info */ + ConnectionInfo.Version = 0x10000; + + /* Create a SID for us */ + Status = RtlAllocateAndInitializeSid(&NtSidAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &SystemSid); + + /* Connect to the port */ + Status = NtSecureConnectPort(&CsrApiPort, + &PortName, + &SecurityQos, + &LpcWrite, + SystemSid, + &LpcRead, + NULL, + &ConnectionInfo, + &ConnectionInfoLength); + NtClose(CsrSectionHandle); + if (!NT_SUCCESS(Status)) + { + /* Failure */ + DPRINT1("Couldn't connect to CSR port\n"); + return Status; + } + + /* Save the delta between the sections, for capture usage later */ + CsrPortMemoryDelta = (ULONG_PTR)LpcWrite.ViewRemoteBase - + (ULONG_PTR)LpcWrite.ViewBase; + + /* Save the Process */ + CsrProcessId = ConnectionInfo.ProcessId; + + /* Save CSR Section data */ + NtCurrentPeb()->ReadOnlySharedMemoryBase = ConnectionInfo.SharedSectionBase; + NtCurrentPeb()->ReadOnlySharedMemoryHeap = ConnectionInfo.SharedSectionHeap; + NtCurrentPeb()->ReadOnlyStaticServerData = ConnectionInfo.SharedSectionData; + + /* Create the port heap */ + CsrPortHeap = RtlCreateHeap(0, + LpcWrite.ViewBase, + LpcWrite.ViewSize, + PAGE_SIZE, + 0, + 0); + + /* Return success */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrClientConnectToServer(PWSTR ObjectDirectory, + ULONG ServerId, + PVOID ConnectionInfo, + PULONG ConnectionInfoSize, + PBOOLEAN ServerToServerCall) +{ + NTSTATUS Status; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING CsrSrvName; + HANDLE hCsrSrv; + ANSI_STRING CsrServerRoutineName; + PCSR_CAPTURE_BUFFER CaptureBuffer; + CSR_API_MESSAGE RosApiMessage; + CSR_API_MESSAGE2 ApiMessage; + PCSR_CLIENT_CONNECT ClientConnect = &ApiMessage.ClientConnect; + + /* Validate the Connection Info */ + DPRINT("CsrClientConnectToServer: %lx %p\n", ServerId, ConnectionInfo); + if (ConnectionInfo && (!ConnectionInfoSize || !*ConnectionInfoSize)) + { + DPRINT1("Connection info given, but no length\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Check if we're inside a CSR Process */ + if (InsideCsrProcess) + { + /* Tell the client that we're already inside CSR */ + if (ServerToServerCall) *ServerToServerCall = TRUE; + return STATUS_SUCCESS; + } + + /* + * We might be in a CSR Process but not know it, if this is the first call. + * So let's find out. + */ + if (!(NtHeader = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress))) + { + /* The image isn't valid */ + DPRINT1("Invalid image\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE); + + /* Now we can check if we are inside or not */ + if (InsideCsrProcess && !UsingOldCsr) + { + /* We're inside, so let's find csrsrv */ + DbgBreakPoint(); + RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); + Status = LdrGetDllHandle(NULL, + NULL, + &CsrSrvName, + &hCsrSrv); + RtlFreeUnicodeString(&CsrSrvName); [truncated at 1000 lines; 87 more skipped]

18 years, 11 months

[ea] 18050: Required for binary compatibility with MS KERNEL32.DLL.

by ea＠svn.reactos.com

Required for binary compatibility with MS KERNEL32.DLL. NOTE Filip and I still don't understand why KERNEL32 calls twice CsrConnectToServer. A possible explanation is because the Win32 server is a dual server: gui+console. This differs with our current implementation in the SM: we accept only console registration requests (see SmpHandleConnectionRequest). Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 12:39:32 UTC (rev 18049) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 13:36:27 UTC (rev 18050) @@ -180,8 +180,15 @@ PSID SystemSid = NULL; CSR_CONNECTION_INFO ConnectionInfo; ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); - DPRINT("CsrConnectToServer\n"); + DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); + + /* Binary compatibility with MS KERNEL32 */ + if (NULL == ObjectDirectory) + { + ObjectDirectory = L"\\Windows"; + } + /* Calculate the total port name size */ PortNameLength = ((wcslen(ObjectDirectory) + 1) * sizeof(WCHAR)) + sizeof(CSR_PORT_NAME);

18 years, 11 months

[hbirr] 18049: Let the compiler search for usable register.

by hbirr＠svn.reactos.com

Let the compiler search for usable register. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-09-25 12:30:51 UTC (rev 18048) +++ trunk/reactos/lib/rtl/heap.c 2005-09-25 12:39:32 UTC (rev 18049) @@ -955,7 +955,7 @@ if ( !Frame ) { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-25 12:30:51 UTC (rev 18048) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-09-25 12:39:32 UTC (rev 18049) @@ -988,7 +988,7 @@ if ( !Frame ) { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif @@ -1042,7 +1042,7 @@ _SEH_TRY { #if defined __GNUC__ - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); #elif defined(_MSC_VER) __asm mov [Frame], ebp #endif

18 years, 11 months

[navaraf] 18048: Use the correct size variables in co_IntCreateWindowEx.

by navaraf＠svn.reactos.com

Use the correct size variables in co_IntCreateWindowEx. Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-25 11:52:42 UTC (rev 18047) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-25 12:30:51 UTC (rev 18048) @@ -1710,18 +1710,18 @@ /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, &MaxTrack); - if (MaxSize.x < nWidth) - nWidth = MaxSize.x; - if (MaxSize.y < nHeight) - nHeight = MaxSize.y; - if (nWidth < MinTrack.x ) - nWidth = MinTrack.x; - if (nHeight < MinTrack.y ) - nHeight = MinTrack.y; - if (nWidth < 0) - nWidth = 0; - if (nHeight < 0) - nHeight = 0; + if (MaxSize.x < Size.cx) + Size.cx = MaxSize.x; + if (MaxSize.y < Size.cy) + Size.cy = MaxSize.y; + if (Size.cx < MinTrack.x ) + Size.cx = MinTrack.x; + if (Size.cy < MinTrack.y ) + Size.cy = MinTrack.y; + if (Size.cx < 0) + Size.cx = 0; + if (Size.cy < 0) + Size.cy = 0; } Window->WindowRect.left = Pos.x; @@ -1744,7 +1744,7 @@ Cs.y = Pos.y; DPRINT("[win32k.window] IntCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); - DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); + DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, Size.cx, Size.cy); DPRINT("IntCreateWindowEx(): About to send NCCREATE message.\n"); Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) &Cs); if (!Result)

18 years, 11 months

[mf] 18047: new tool bar icons for the drive bar

by mf＠svn.reactos.com

new tool bar icons for the drive bar Modified: trunk/reactos/subsys/system/explorer/res/drivebar.bmp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/res/drivebar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-25 11:16:54 UTC (rev 18046) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-25 11:52:42 UTC (rev 18047) @@ -729,29 +729,34 @@ // insert shell namespace button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Shell\0")); extraBtns.idCommand = ID_DRIVE_SHELL_NS; + extraBtns.iBitmap = 6; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); // insert web control button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Web\0")); extraBtns.idCommand = ID_WEB_WINDOW; + extraBtns.iBitmap = 7; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); if ((HIWORD(GetVersion())>>14) == W_VER_NT) { // insert NT object namespace button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("NT Obj\0")); extraBtns.idCommand = ID_DRIVE_NTOBJ_NS; + extraBtns.iBitmap = 8; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); } // insert Registry button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0")); extraBtns.idCommand = ID_DRIVE_REGISTRY; + extraBtns.iBitmap = 9; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); #ifdef _DEBUG // insert FAT direct file system access button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("FAT\0")); extraBtns.idCommand = ID_DRIVE_FAT; + extraBtns.iBitmap = 10; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); #endif

18 years, 11 months

[navaraf] 18046: - Intersect the paint rectangle in NtUserBeginPaint with the client window rectangle.

by navaraf＠svn.reactos.com

- Intersect the paint rectangle in NtUserBeginPaint with the client window rectangle. - Fix the data returned by co_UserGetUpdateRgn and NtUserGetUpdateRect. Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-25 11:05:00 UTC (rev 18045) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-25 11:16:54 UTC (rev 18046) @@ -755,7 +755,7 @@ Ps.hdc = UserGetDCEx(Window, Window->UpdateRegion, DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps.hdc) { - RETURN( NULL); + RETURN(NULL); } if (Window->UpdateRegion != NULL) @@ -766,6 +766,7 @@ { UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); RGNDATA_UnlockRgn(Rgn); + IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->ClientRect); IntGdiOffsetRect(&Ps.rcPaint, -Window->ClientRect.left, -Window->ClientRect.top); @@ -801,10 +802,10 @@ if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( NULL); + RETURN(NULL); } - RETURN( Ps.hdc); + RETURN(Ps.hdc); CLEANUP: if (Window) UserDerefObjectCo(Window); @@ -855,6 +856,7 @@ co_UserGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase) { int RegionType; + RECT Rect; ASSERT_REFS_CO(Window); @@ -864,7 +866,10 @@ } else { - RegionType = NtGdiCombineRgn(hRgn, Window->UpdateRegion, hRgn, RGN_COPY); + Rect = Window->ClientRect; + IntIntersectWithParents(Window, &Rect); + NtGdiSetRectRgn(hRgn, Rect.left, Rect.top, Rect.right, Rect.bottom); + RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->UpdateRegion, RGN_AND); NtGdiOffsetRgn(hRgn, -Window->ClientRect.left, -Window->ClientRect.top); } @@ -875,6 +880,7 @@ return RegionType; } + /* * NtUserGetUpdateRgn * @@ -923,7 +929,6 @@ RECT Rect; INT RegionType; PROSRGNDATA RgnData; - BOOL AlwaysPaint; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -932,7 +937,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { - RETURN( ERROR); + RETURN(FALSE); } if (Window->UpdateRegion == NULL) @@ -941,16 +946,34 @@ } else { - RgnData = RGNDATA_LockRgn(Window->UpdateRegion); - ASSERT(RgnData != NULL); - RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); - ASSERT(RegionType != ERROR); - RGNDATA_UnlockRgn(RgnData); + /* Get the update region bounding box. */ + if (Window->UpdateRegion == (HRGN)1) + { + Rect = Window->ClientRect; + } + else + { + RgnData = RGNDATA_LockRgn(Window->UpdateRegion); + ASSERT(RgnData != NULL); + RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); + RGNDATA_UnlockRgn(RgnData); + + if (RegionType != ERROR && RegionType != NULLREGION) + IntGdiIntersectRect(&Rect, &Rect, &Window->ClientRect); + } + + if (IntIntersectWithParents(Window, &Rect)) + { + IntGdiOffsetRect(&Rect, + -Window->ClientRect.left, + -Window->ClientRect.top); + } else + { + Rect.left = Rect.top = Rect.right = Rect.bottom = 0; + } } - AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || - (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); - if (bErase && Rect.left < Rect.right && Rect.top < Rect.bottom) + if (bErase && !IntGdiIsEmptyRect(&Rect)) { UserRefObjectCo(Window); co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); @@ -963,11 +986,11 @@ if (!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + RETURN(FALSE); } } - RETURN( (Rect.left < Rect.right && Rect.top < Rect.bottom) || AlwaysPaint); + RETURN(Window->UpdateRegion != NULL); CLEANUP: DPRINT("Leave NtUserGetUpdateRect, ret=%i\n",_ret_); @@ -1314,7 +1337,7 @@ UserDerefObjectCo(CaretWnd); } - RETURN( Result); + RETURN(Result); CLEANUP: if (Window)

18 years, 11 months

[navaraf] 18045: Patricio Martínez Ros <silencium@wanadoo.es>

by navaraf＠svn.reactos.com

Patricio Martínez Ros <silencium(a)wanadoo.es> Update spanish translation. Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-09-25 10:52:51 UTC (rev 18044) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-09-25 11:05:00 UTC (rev 18045) @@ -1,482 +1,491 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -/////////////////////////////////////////////////////////////////////// ////// - - -/////////////////////////////////////////////////////////////////////// ////// -// Spanish (Castilian) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Salir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR - MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&SDI", ID_VIEW_SDI - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &Simbolos", ID_WINDOW_ARRANGE - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "A&yuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&en el Portapapeles...\tF9", 118 - MENUITEM "&Eliminar\tDel", 108 - MENUITEM "Re&nombrar...", 109 - MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "Desc&omprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "&Ejecutar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "Asociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&ear Directorio...", ID_EXECUTE - MENUITEM "Busca&r...", 104 - MENUITEM "&Seleccionar Archivos...", 116 - MENUITEM SEPARATOR - MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "&Copiar Disco...", 201 - MENUITEM "&Etiqueta del Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formateart Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar a &Unidad de Red", 252 - MENUITEM "&Desconectar Unidad de Red", 253 - MENUITEM SEPARATOR - MENUITEM "Guardar como...", 254 - MENUITEM "&Eliminar Guardado...", 255 - MENUITEM SEPARATOR - MENUITEM "&Seleccionar Unidad...", 251 - END - POPUP "&Directorios" - BEGIN - MENUITEM "&Siguiente Nivel\t+", 301 - MENUITEM "Expandir &Arbol\t*", 302 - MENUITEM "Expandir &Todo\tStrg+*", 303 - MENUITEM "Contraer &Arbol\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Marcar Hijos", 505 - END - POPUP "&Ver" - BEGIN - MENUITEM "A&rbol y Directorio", 413 - MENUITEM "Solo Arb&ol", 411 - MENUITEM "S&olo Directorio", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", 414 - MENUITEM SEPARATOR - MENUITEM "&Nombre", ID_VIEW_NAME - MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ordenar por Nombre", 404 - MENUITEM "Ordenar &por Tipo", 405 - MENUITEM "Ord&enar por Tama±o", 406 - MENUITEM "Or&denar por Fecha", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opciones" - BEGIN - MENUITEM "&Confirmacion...", 65535 - MENUITEM "&Fuente...", 65535 - MENUITEM "Personalizar la &Barra de Herramientas...", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - END - POPUP "&Seguridad" - BEGIN - MENUITEM "&Aceso...", 605 - MENUITEM "&Entrada...", 606 - MENUITEM "&Propietario...", 607 - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &Simbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Temas de Ayuda\tF1", ID_HELP - MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP - MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Administrador de Tareas...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME - MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA - MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "S&alir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Ayuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 - PUSHBUTTON "&Cancelar",2,158,23,47,14 - PUSHBUTTON "&Ayuda",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Buscar Programa en el menu Inicio" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filtro:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de Pantalla" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", - IDC_STATIC,7,7,166,8 - CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de la Barra de Tareas" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&Ocultar iconos de notificacion inactivos", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades del Menu Inicio" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Configure Notification Icons" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Texto de Info:",IDC_LABEL1,7,44,45,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,84,42,117,14,ES_AUTOHSCROLL - LTEXT "Titulo de la V&entana:",IDC_LABEL2,7,63,66,8 - EDITTEXT IDC_NOTIFY_TITLE,84,60,117,14,ES_AUTOHSCROLL - LTEXT "&Parche del Modulo:",IDC_LABEL3,7,81,62,8 - EDITTEXT IDC_NOTIFY_MODULE,84,78,117,14,ES_AUTOHSCROLL - GROUPBOX "Modo de &Display",IDC_LABEL4,7,95,157,28 - CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,107,33,10 - CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, - 63,107,29,10 - CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,104,107,51,10 - ICON "",IDC_PICTURE,173,100,20,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,153,65,10 - DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "Reactos Explorer" - IDS_START "Iniciar" - IDS_LOGOFF "Salir..." - IDS_SHUTDOWN "Apagar..." - IDS_LAUNCH "Ejecutar..." - IDS_START_HELP "Ayuda" - IDS_SEARCH_FILES "Buscar..." - IDS_DOCUMENTS "Documentos" - IDS_FAVORITES "Favoritos" - IDS_PROGRAMS "Programas" - IDS_SETTINGS "Configuracion" - IDS_EXPLORE "Explorar" - IDS_EMPTY "(Vacio)" - IDS_RECENT "Documentos Recientes" - IDS_ADMIN "Administracion" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Menu Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" - IDS_DESKTOP_NUM "Escritorio %d" - IDS_VOLUME "Volumen" - IDS_ITEMS_CUR "Objetos Actuales" - IDS_ITEMS_CONFIGURED "configuracion" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "oculto" - IDS_NOTIFY_SHOW "mostrar" - IDS_NOTIFY_HIDE "ocultar" - IDS_NOTIFY_AUTOHIDE "autoocultar" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" - IDS_TERMINATE "Salir" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Res" - IDS_CONNECTIONS "Conexiones de Red" - IDS_DRIVES "Unidades" - IDS_SEARCH_COMPUTER "Buscar PC..." - IDS_SETTINGS_MENU "Menus de Configuracion" - IDS_CONTROL_PANEL "Panel de Control" - IDS_PRINTERS "Impresoras" - IDS_BROWSE "Explorer Archivos" - IDS_SEARCH_PRG "Buscar Programas..." - IDS_ALL_USERS "Todos los Usuarios\\" - IDS_SEARCH "Buscar" - IDS_ABOUT_EXPLORER "&Acerca de Explorer..." - IDS_LAUNCH_MANY_PROGRAMS - "Ha seleccionado mas de un programa.\n?Estß seguro de que desea ejecutarlos todos ?" - IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" - IDS_DESKTOP "Escritorio" - IDS_TASKBAR "Barra de Tareas" -END - -#endif // Spanish (Castilian) resources -/////////////////////////////////////////////////////////////////////// ////// - - - -#ifndef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/////////////////////////////////////////////////////////////////////// ////// -#endif // not APSTUDIO_INVOKED - +/* + * Explorer (Spanish resources) + * + * Copyright 2005 Patricio MartÝnez Ros + * + */ + +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Salir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR + MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&SDI", ID_VIEW_SDI + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "A&yuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Administrador de Tareas...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME + MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS + MENUITEM "Mostrar &Bot¾n de Icono", ID_SHOW_ICON_BUTTON + MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA + MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "Herramientas" + BEGIN + MENUITEM "&Opciones", ID_TOOLS_OPTIONS + END + POPUP "&Ayuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Abrir\tEnter", 101 + MENUITEM "&Mover...\tF7", 106 + MENUITEM "&Copiar...\tF8", 107 + MENUITEM "&en el Portapapeles...\tF9", 118 + MENUITEM "&Eliminar\tDel", 108 + MENUITEM "Re&nombrar...", 109 + MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir...", 119 + MENUITEM "Desc&omprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "&Ejecutar...", ID_EXECUTE + MENUITEM "&Imprimir...", 102 + MENUITEM "Asociar...", 103 + MENUITEM SEPARATOR + MENUITEM "Cr&ear Directorio...", ID_EXECUTE + MENUITEM "Busca&r...", 104 + MENUITEM "&Seleccionar Archivos...", 116 + MENUITEM SEPARATOR + MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT + END + POPUP "&Disco" + BEGIN + MENUITEM "&Copiar Disco...", 201 + MENUITEM "&Etiqueta del Disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formateart Disco...", 203 + MENUITEM SEPARATOR + MENUITEM "Conectar a &Unidad de Red", 252 + MENUITEM "&Desconectar Unidad de Red", 253 + MENUITEM SEPARATOR + MENUITEM "Guardar como...", 254 + MENUITEM "&Eliminar Guardado...", 255 + MENUITEM SEPARATOR + MENUITEM "&Seleccionar Unidad...", 251 + END + POPUP "&Directorios" + BEGIN + MENUITEM "&Siguiente Nivel\t+", 301 + MENUITEM "Expandir &Arbol\t*", 302 + MENUITEM "Expandir &Todo\tStrg+*", 303 + MENUITEM "Contraer &Arbol\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Marcar Hijos", 505 + END + POPUP "&Ver" + BEGIN + MENUITEM "A&rbol y Directorio", 413 + MENUITEM "Solo Arb&ol", 411 + MENUITEM "S&olo Directorio", 412 + MENUITEM SEPARATOR + MENUITEM "Sp&lit", 414 + MENUITEM SEPARATOR + MENUITEM "&Nombre", ID_VIEW_NAME + MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ordenar por Nombre", 404 + MENUITEM "Ordenar &por Tipo", 405 + MENUITEM "Ord&enar por Tama±o", 406 + MENUITEM "Or&denar por Fecha", 407 + MENUITEM SEPARATOR + MENUITEM "Ordenar por &...", 409 + END + POPUP "&Opciones" + BEGIN + MENUITEM "&Confirmacion...", 65535 + MENUITEM "&Fuente...", 65535 + MENUITEM "Personalizar la &Barra de Herramientas...", 65535 + MENUITEM SEPARATOR + MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&SÝmbolo despuÚs de ejecutar", 65535 + MENUITEM "&Guardar cambios al salir", 511 + END + POPUP "&Seguridad" + BEGIN + MENUITEM "&Aceso...", 605 + MENUITEM "&Entrada...", 606 + MENUITEM "&Propietario...", 607 + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + MENUITEM "&Actualizar\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Temas de Ayuda\tF1", ID_HELP + MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP + MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ejecutar" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "Orden:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Como &SÝmbolo",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 + PUSHBUTTON "&Cancelar",2,158,23,47,14 + PUSHBUTTON "&Ayuda",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Buscar Programa en el menu Inicio" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtro:",IDC_STATIC,7,9,23,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,136,7,57,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de Pantalla" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", + IDC_STATIC,7,7,195,8 + CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "aproximado",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Barra de Tareas" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,56,10 + CONTROL "&Ocultar iconos de notificacion inactivos", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,136,10 + PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,145,173,64,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades del Men· Inicio" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configurar Iconos de Notificaciones" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Texto de Info:",IDC_LABEL1,8,44,51,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,82,42,117,14,ES_AUTOHSCROLL + LTEXT "TÝtulo de la V&entana:",IDC_LABEL2,8,63,70,8 + EDITTEXT IDC_NOTIFY_TITLE,82,60,117,14,ES_AUTOHSCROLL + LTEXT "&Parche del M¾dulo:",IDC_LABEL3,8,81,65,8 + EDITTEXT IDC_NOTIFY_MODULE,82,78,117,14,ES_AUTOHSCROLL + GROUPBOX "Modo de &Display",IDC_LABEL4,7,96,157,28 + CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,38,10 + CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,36,10 + CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,50,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "?ltimo cambio:",IDC_LABEL6,7,132,50,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,64,10 + DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Elegir modo MDI / SDI" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", + IDC_STATIC,7,7,170,18 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,123,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,116,10 + LTEXT "Esta configuraci¾n se usarß por defecto y apartir de ahora para todas las ventanas del explorador.", + IDC_STATIC,7,76,174,22 + DEFPUSHBUTTON "&Aceptar",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,106,105,50,14 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Iniciar" + IDS_LOGOFF "Salir..." + IDS_SHUTDOWN "Apagar..." + IDS_LAUNCH "Ejecutar..." + IDS_START_HELP "Ayuda" + IDS_SEARCH_FILES "Buscar..." + IDS_DOCUMENTS "Documentos" + IDS_FAVORITES "Favoritos" + IDS_PROGRAMS "Programas" + IDS_SETTINGS "Configuraci¾n" + IDS_EXPLORE "Explorar" + IDS_EMPTY "(VacÝo)" + IDS_RECENT "Documentos Recientes" + IDS_ADMIN "Administracion" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Men· Inicio" + IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_DESKTOP_NUM "Escritorio %d" + IDS_VOLUME "Volumen" + IDS_ITEMS_CUR "Objetos Actuales" + IDS_ITEMS_CONFIGURED "configuraci¾n" + IDS_ITEMS_VISIBLE "visible" + IDS_ITEMS_HIDDEN "oculto" + IDS_NOTIFY_SHOW "mostrar" + IDS_NOTIFY_HIDE "ocultar" + IDS_NOTIFY_AUTOHIDE "autoocultar" + IDS_SHOW_HIDDEN_ICONS "Mostrar iconos ocultos" + IDS_HIDE_ICONS "Ocultar iconos" + IDS_TERMINATE "Finalizar ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Red" + IDS_CONNECTIONS "Conexiones de Red" + IDS_DRIVES "Unidades" + IDS_SEARCH_COMPUTER "Buscar PC..." + IDS_SETTINGS_MENU "Men·s de Configuraci¾n" + IDS_CONTROL_PANEL "Panel de Control" + IDS_PRINTERS "Impresoras" + IDS_BROWSE "Explorar Archivos" + IDS_SEARCH_PRG "Buscar Programas..." + IDS_ALL_USERS "Todos los Usuarios\\" + IDS_SEARCH "Buscar" + IDS_ABOUT_EXPLORER "&Acerca de Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Ha seleccionado mßs de un programa.\n?Estß seguro de que desea ejecutarlos todos?" + IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" + IDS_DESKTOP "Escritorio" + IDS_TASKBAR "Barra de Tareas" +END + +#endif // Spanish (Castilian) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED +

18 years, 11 months

[navaraf] 18044: Patricio Martínez Ros <silencium@wanadoo.es>

by navaraf＠svn.reactos.com

Patricio Martínez Ros <silencium(a)wanadoo.es> Update spanish translation. Modified: trunk/reactos/subsys/system/regedit/Es.rc _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-09-25 09:23:05 UTC (rev 18043) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-09-25 10:52:51 UTC (rev 18044) @@ -2,6 +2,7 @@ * Regedit resources * * Copyright 2003 JosÚ Manuel Ferrer Ortiz + * Copyright 2005 Patricio MartÝnez Ros * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -88,7 +89,7 @@ END POPUP "&Ayuda" BEGIN - MENUITEM "&Help Topics", ID_HELP_HELPTOPICS + MENUITEM "Temas de Ayuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&Acerca de Editor de registro", ID_HELP_ABOUT END

18 years, 11 months

[navaraf] 18043: Add TestAlert check to NtContinue.

by navaraf＠svn.reactos.com

Add TestAlert check to NtContinue. Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c _____ Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c --- trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:22:22 UTC (rev 18042) +++ trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:23:05 UTC (rev 18043) @@ -80,6 +80,11 @@ KeLowerIrql(oldIrql); } + if (TestAlert) + { + KeTestAlertThread(TrapFrame->PreviousMode); + } + /* Restore the user context */ Thread->TrapFrame = PrevTrapFrame; __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame));

18 years, 11 months

[navaraf] 18042: Fix up the indentation.

by navaraf＠svn.reactos.com

Fix up the indentation. Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c _____ Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c --- trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 04:55:16 UTC (rev 18041) +++ trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:22:22 UTC (rev 18042) @@ -22,66 +22,67 @@ * @implemented */ NTSTATUS STDCALL -NtContinue ( - IN PCONTEXT Context, - IN BOOLEAN TestAlert) +NtContinue( + IN PCONTEXT Context, + IN BOOLEAN TestAlert) { - PKTHREAD Thread = KeGetCurrentThread(); - PKTRAP_FRAME TrapFrame = Thread->TrapFrame; - PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; - PFX_SAVE_AREA FxSaveArea; - KIRQL oldIrql; + PKTHREAD Thread = KeGetCurrentThread(); + PKTRAP_FRAME TrapFrame = Thread->TrapFrame; + PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + PFX_SAVE_AREA FxSaveArea; + KIRQL oldIrql; - DPRINT("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp ); - PULONG Frame = 0; - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); - DPRINT( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame ); #ifndef NDEBUG - KeRosDumpStackFrames(NULL,5); + DPRINT("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp ); + PULONG Frame = 0; + __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + DPRINT( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame ); + KeRosDumpStackFrames(NULL,5); #endif - if ( Context == NULL ) - { - DPRINT1("NtContinue called with NULL Context\n"); - return STATUS_INVALID_PARAMETER; - } + if (Context == NULL) + { + DPRINT1("NtContinue called with NULL Context\n"); + return STATUS_INVALID_PARAMETER; + } - if ( TrapFrame == NULL ) - { - CPRINT("NtContinue called but TrapFrame was NULL\n"); - KEBUGCHECK(0); - } + if (TrapFrame == NULL) + { + CPRINT("NtContinue called but TrapFrame was NULL\n"); + KEBUGCHECK(0); + } - /* - * Copy the supplied context over the register information that was saved - * on entry to kernel mode, it will then be restored on exit - * FIXME: Validate the context - */ - KeContextToTrapFrame ( Context, TrapFrame ); + /* + * Copy the supplied context over the register information that was saved + * on entry to kernel mode, it will then be restored on exit + * FIXME: Validate the context + */ + KeContextToTrapFrame(Context, TrapFrame); - /* Put the floating point context into the thread's FX_SAVE_AREA - * and make sure it is reloaded when needed. - */ - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); - if (KiContextToFxSaveArea(FxSaveArea, Context)) - { - Thread->NpxState = NPX_STATE_VALID; - KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - if (KeGetCurrentPrcb()->NpxThread == Thread) - { - KeGetCurrentPrcb()->NpxThread = NULL; - Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); - } - else - { - ASSERT((Ke386GetCr0() & X86_CR0_TS) == X86_CR0_TS); - } - KeLowerIrql(oldIrql); - } + /* + * Put the floating point context into the thread's FX_SAVE_AREA + * and make sure it is reloaded when needed. + */ + FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + if (KiContextToFxSaveArea(FxSaveArea, Context)) + { + Thread->NpxState = NPX_STATE_VALID; + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); + if (KeGetCurrentPrcb()->NpxThread == Thread) + { + KeGetCurrentPrcb()->NpxThread = NULL; + Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); + } + else + { + ASSERT((Ke386GetCr0() & X86_CR0_TS) == X86_CR0_TS); + } + KeLowerIrql(oldIrql); + } - /* Restore the user context */ - Thread->TrapFrame = PrevTrapFrame; - __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame)); + /* Restore the user context */ + Thread->TrapFrame = PrevTrapFrame; + __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame)); - return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */ + return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */ }

18 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
59
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 September 2005