Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[ekohl] 71638: [SC] - Add the 'failure' command. The 'actions' option is not implemented yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 14 20:34:21 2016 New Revision: 71638 URL: http://svn.reactos.org/svn/reactos?rev=71638&view=rev Log: [SC] - Add the 'failure' command. The 'actions' option is not implemented yet. Added: trunk/reactos/base/applications/sc/failure.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/misc.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -7,6 +7,7 @@ create.c delete.c description.c + failure.c misc.c print.c qfailure.c Added: trunk/reactos/base/applications/sc/failure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/failu… ============================================================================== --- trunk/reactos/base/applications/sc/failure.c (added) +++ trunk/reactos/base/applications/sc/failure.c [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/failure.c + * PURPOSE: Set the service failure actions + * COPYRIGHT: Copyright 2016 Eric Kohl + */ + +#include "sc.h" + +BOOL +SetFailure( + LPCTSTR *ServiceArgs, + INT ArgCount) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + SERVICE_FAILURE_ACTIONS FailureActions; + LPCTSTR lpServiceName = NULL; + + if (!ParseFailureArguments(ServiceArgs, ArgCount, &lpServiceName, &FailureActions)) + { + SetFailureUsage(); + return FALSE; + } + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); + if (hService == NULL) + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!ChangeServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + (LPBYTE)&FailureActions)) + { + _tprintf(_T("[SC] ChangeServiceConfig2 FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + _tprintf(_T("[SC] ChangeServiceConfig2 SUCCESS\n\n")); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/failure.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/misc.… ============================================================================== --- trunk/reactos/base/applications/sc/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/misc.c [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -158,3 +158,70 @@ return (ArgCount == 0); } + + +BOOL +ParseFailureArguments( + IN LPCTSTR *ServiceArgs, + IN INT ArgCount, + OUT LPCTSTR *ppServiceName, + OUT LPSERVICE_FAILURE_ACTIONS pFailureActions) +{ + INT /*i,*/ ArgIndex = 1; + LPCTSTR lpActions = NULL; + LPCTSTR lpReset = NULL; + + if (ArgCount < 1) + return FALSE; + + ZeroMemory(pFailureActions, sizeof(SERVICE_FAILURE_ACTIONS)); + + *ppServiceName = ServiceArgs[0]; + + ArgCount--; + + while (ArgCount > 1) + { + if (!lstrcmpi(ServiceArgs[ArgIndex], _T("actions="))) + { + lpActions = (LPTSTR)ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("command="))) + { + pFailureActions->lpCommand = (LPTSTR)ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("reboot="))) + { + pFailureActions->lpRebootMsg = (LPTSTR)ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("reset="))) + { + lpReset = (LPTSTR)ServiceArgs[ArgIndex + 1]; + } + + ArgIndex += 2; + ArgCount -= 2; + } + + if ((lpReset == NULL && lpActions != NULL) || + (lpReset != NULL && lpActions == NULL)) + { + _tprintf(_T("ERROR: The reset and actions options must be used simultaneously.\n\n")); + return FALSE; + } + + if (lpReset != NULL) + { + if (!lstrcmpi(lpReset, _T("infinite"))) + pFailureActions->dwResetPeriod = INFINITE; + else + pFailureActions->dwResetPeriod = _ttoi(lpReset); + } + + if (lpActions != NULL) + { + /* FIXME */ + } + + return (ArgCount == 0); +} Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -268,6 +268,10 @@ { SetConfig(ServiceArgs, ArgCount); } + else if (!lstrcmpi(Command, _T("failure"))) + { + SetFailure(ServiceArgs, ArgCount); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -44,6 +44,7 @@ BOOL QueryDescription(LPCTSTR ServiceName); BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description); BOOL QueryFailure(LPCTSTR ServiceName); +BOOL SetFailure(LPCTSTR *ServiceArgs, INT ArgCount); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -56,6 +57,13 @@ INT ArgCount, BOOL bChangeService, OUT LPSERVICE_CREATE_INFO lpServiceInfo); + +BOOL +ParseFailureArguments( + LPCTSTR *ServiceArgs, + INT ArgCount, + OUT LPCTSTR *ppServiceName, + OUT LPSERVICE_FAILURE_ACTIONS pFailureActions); /* usage functions */ VOID MainUsage(VOID); @@ -74,5 +82,6 @@ VOID QueryFailureUsage(VOID); VOID SetDescriptionUsage(VOID); VOID SetConfigUsage(VOID); +VOID SetFailureUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Tue Jun 14 20:34:21 2016 @@ -243,3 +243,22 @@ _T(" DisplayName= <display name>\n") _T(" password= <password>\n")); } + +VOID SetFailureUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Changes the actions upon failure.\n") + _T("USAGE:\n") + _T(" sc <server> failure [service name] <option1> <option2>...\n") + _T("\n") + _T("OPTIONS:\n") + _T(" reset= <Length of period of no failures (in seconds)\n") + _T(" after which to reset the failure count to 0 (may be INFINITE)>\n") + _T(" (Must be used in conjunction with actions= )\n") + _T(" reboot= <Message broadcast before rebooting on failure>\n") + _T(" command= <Command line to be run on failure>\n") + _T(" actions= <Failure actions and their delay time (in milliseconds),\n") + _T(" separated by / (forward slash) -- e.g., run/5000/reboot/800\n") + _T(" Valid actions are <run|restart|reboot> >\n") + _T(" (Must be used in conjunction with the reset= option)\n")); +}

8 years, 7 months

[zhu] 71637: Reworked message passing. Created struct TCP_CONTEXT. Moved lwip_tcp_pcb from ADDRESS_FILE to TCP_CONTEXT. Successfully binding and handshaking between server and client, but address d...

by zhu＠svn.reactos.org

Author: zhu Date: Tue Jun 14 19:43:03 2016 New Revision: 71637 URL: http://svn.reactos.org/svn/reactos?rev=71637&view=rev Log: Reworked message passing. Created struct TCP_CONTEXT. Moved lwip_tcp_pcb from ADDRESS_FILE to TCP_CONTEXT. Successfully binding and handshaking between server and client, but address destruction is still faulty and causes crashes. Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.c [iso-8859-1] Tue Jun 14 19:43:03 2016 @@ -233,7 +233,22 @@ ADDRESS_FILE *AddressFile; LIST_ENTRY* ListEntry; KIRQL OldIrql; + + ULONG *temp; + USHORT Port = 1; + + temp = (ULONG*)Address; + DPRINT1("\n TcpIpCreateAddress Input Dump\n %08x %08x %08x %08x\n", + temp[3], temp[2], + temp[1], temp[0]); + + temp = IrpSp->FileObject->FsContext; + if (temp) { + DPRINT1("\n IrpSp Dump\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", + temp[7], temp[6], temp[5], temp[4], + temp[3], temp[2], temp[1], temp[0]); + } /* See if this port is already taken, and find a free one if needed. */ KeAcquireSpinLock(&AddressListLock, &OldIrql); @@ -327,9 +342,17 @@ case IPPROTO_TCP: { ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - AddressFile->lwip_tcp_pcb = tcp_new(); + AddressFile->ConnectionContext = NULL; +/* tcp_bind(AddressFile->lwip_tcp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); + DPRINT1("\n Attempt Bind to Address\n Port: %04x\n Address: %08x\n", + AddressFile->Address.sin_port, + IpAddr);*/ + temp = (ULONG*)&AddressFile->Address; + DPRINT1("\n Dump: %08x %08x\n", + temp[1], + temp[0]); break; } case IPPROTO_UDP: @@ -378,6 +401,37 @@ } NTSTATUS +TcpIpCreateContext( + _Inout_ PIRP Irp, + _In_ IPPROTO Protocol +) +{ + PIO_STACK_LOCATION IrpSp; + PTCP_CONTEXT Context; + + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Context), TAG_ADDRESS_FILE); + + if (Protocol != IPPROTO_TCP) + { + DPRINT1("Creating connection context for non-TCP protocoln"); + return STATUS_INVALID_PARAMETER; + } + Context->Protocol = Protocol; + Context->lwip_tcp_pcb = tcp_new(); + if (Context->lwip_tcp_pcb == NULL) + { + return STATUS_NO_MEMORY; + } + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + IrpSp->FileObject->FsContext = (PVOID)Context; + IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; + + return STATUS_SUCCESS; +} + +NTSTATUS TcpIpCloseAddress( _Inout_ ADDRESS_FILE* AddressFile ) @@ -397,7 +451,12 @@ /* remove the lwip pcb */ if (AddressFile->Protocol == IPPROTO_UDP) udp_remove(AddressFile->lwip_udp_pcb); - else if (AddressFile->Protocol != IPPROTO_TCP) + else if (AddressFile->Protocol == IPPROTO_TCP && AddressFile->ConnectionContext) + { + tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); + ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_ADDRESS_FILE); + } + else raw_remove(AddressFile->lwip_raw_pcb); /* Remove from the list and free the structure */ @@ -407,7 +466,6 @@ RemoveEntityInstance(&AddressFile->Instance); ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); - return STATUS_SUCCESS; } @@ -525,10 +583,10 @@ SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port); DPRINT1("\n Local Address\n Address: %08x\n Port: %04x\n", - AddressFile->lwip_tcp_pcb->local_ip, - AddressFile->lwip_tcp_pcb->local_port); - - lwip_err = tcp_connect(AddressFile->lwip_tcp_pcb, + AddressFile->ConnectionContext->lwip_tcp_pcb->local_ip, + AddressFile->ConnectionContext->lwip_tcp_pcb->local_port); + + lwip_err = tcp_connect(AddressFile->ConnectionContext->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_Connected_callback); @@ -566,7 +624,7 @@ case (ERR_OK) : { DPRINT1("lwip ERR_OK\n"); - tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + tcp_arg(AddressFile->ConnectionContext->lwip_tcp_pcb, Irp); break; } default : @@ -586,8 +644,8 @@ _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE *AddressFile; - ADDRESS_FILE *BindTo; + PTCP_CONTEXT Context; + PADDRESS_FILE AddressFile; PTDI_REQUEST_KERNEL_ASSOCIATE RequestInfo; PFILE_OBJECT FileObject; @@ -596,21 +654,15 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - return STATUS_FILE_INVALID; - } + if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) + { + DPRINT1("Associating something that is not a TDI_CONNECTION_FILE\n"); + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + Context = IrpSp->FileObject->FsContext; /* Get address file */ - AddressFile = IrpSp->FileObject->FsContext; - - if (AddressFile->Protocol != IPPROTO_TCP) - { - DPRINT1("Received TDI_ASSOCIATE_ADDRESS for a non-TCP protocol\n"); - return STATUS_INVALID_ADDRESS; - } - RequestInfo = (PTDI_REQUEST_KERNEL_ASSOCIATE)&IrpSp->Parameters; Status = ObReferenceObjectByHandle( @@ -632,59 +684,77 @@ ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } - BindTo = FileObject->FsContext; - if (BindTo->Protocol != IPPROTO_TCP) + AddressFile = FileObject->FsContext; + if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("TCP socket association with non-TCP handle\n"); ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } + if (AddressFile->Address.in_addr == 0) + { + AddressFile->Address.in_addr = 0x0100007f; + } + DPRINT1("\n TDI Address\n Port: %04x\n Address: %08x\n", - BindTo->Address.sin_port, - BindTo->Address.in_addr); + AddressFile->Address.sin_port, + AddressFile->Address.in_addr); /* Finally calling into lwip to perform socket bind */ lwip_err = tcp_bind( - AddressFile->lwip_tcp_pcb, - (ip_addr_t *)&BindTo->Address.in_addr, - BindTo->Address.sin_port); - + Context->lwip_tcp_pcb, + (ip_addr_t *)&AddressFile->Address.in_addr, + AddressFile->Address.sin_port); DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", lwip_err, - AddressFile->lwip_tcp_pcb->local_ip, - AddressFile->lwip_tcp_pcb->local_port, - AddressFile->lwip_tcp_pcb->remote_ip, - AddressFile->lwip_tcp_pcb->remote_port); + Context->lwip_tcp_pcb->local_ip, + Context->lwip_tcp_pcb->local_port, + Context->lwip_tcp_pcb->remote_ip, + Context->lwip_tcp_pcb->remote_port); + + IrpSp->FileObject->FsContext = AddressFile; + IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; + if (lwip_err != ERR_OK) { switch (lwip_err) { case (ERR_BUF) : { - /* Not actually sure which error I should return here - ERR_BUF means the port is already taken - fix when I figure out how to use NDIS errors */ - Status = STATUS_ADDRESS_ALREADY_EXISTS; + DPRINT1("lwIP ERR_BUFF\n"); + Status = STATUS_NO_MEMORY; goto LEAVE; } case (ERR_VAL) : { + DPRINT1("lwIP ERR_VAL\n"); Status = STATUS_INVALID_PARAMETER; goto LEAVE; } case (ERR_USE) : { + DPRINT1("lwIP ERR_USE\n"); Status = STATUS_ADDRESS_ALREADY_EXISTS; goto LEAVE; } + case (ERR_OK) : + { + DPRINT1("lwIP ERR_OK\n"); + break; + } default : { - break; + DPRINT1("lwIP unexpected error\n"); + Status = STATUS_NOT_IMPLEMENTED; + goto LEAVE; } } } - ip_set_option(AddressFile->lwip_tcp_pcb, SOF_BROADCAST); + ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); + + Context->AddressFile = AddressFile; + AddressFile->ConnectionContext = Context; Status = STATUS_SUCCESS; LEAVE: @@ -700,8 +770,6 @@ PIO_STACK_LOCATION IrpSp; ADDRESS_FILE *AddressFile; - err_t lwip_err; - IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) { @@ -716,17 +784,7 @@ return STATUS_INVALID_ADDRESS; } - lwip_err = tcp_close(AddressFile->lwip_tcp_pcb); - switch (lwip_err) - { - case ERR_MEM : - return STATUS_NO_MEMORY; - case ERR_OK : - break; - default : - DPRINT1("Unexpected lwIP error\n"); - return STATUS_NOT_IMPLEMENTED; - } + /* NO-OP because we need the address to deallocate the port when the connection closes */ return STATUS_SUCCESS; } @@ -737,7 +795,8 @@ _Inout_ PIRP Irp) { PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE *AddressFile; + PADDRESS_FILE AddressFile; + PTCP_CONTEXT ConnectionContext; struct tcp_pcb *lpcb; @@ -746,19 +805,21 @@ /* Check this is really an address file */ if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) { + DPRINT1("Not an address file\n"); return STATUS_FILE_INVALID; } /* Get address file */ AddressFile = IrpSp->FileObject->FsContext; - if (AddressFile->Protocol != IPPROTO_TCP) + ConnectionContext = AddressFile->ConnectionContext; + if (ConnectionContext->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_LISTEN for a non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; } /* Call down into lwip to initiate a listen */ - lpcb = tcp_listen(AddressFile->lwip_tcp_pcb); + lpcb = tcp_listen(ConnectionContext->lwip_tcp_pcb); DPRINT1("lwip tcp_listen returned\n"); if (lpcb == NULL) { @@ -770,11 +831,11 @@ } else { - AddressFile->lwip_tcp_pcb = lpcb; - } - - tcp_accept(AddressFile->lwip_tcp_pcb, lwip_tcp_accept_callback); - tcp_arg(AddressFile->lwip_tcp_pcb, Irp); + ConnectionContext->lwip_tcp_pcb = lpcb; + } + + tcp_accept(ConnectionContext->lwip_tcp_pcb, lwip_tcp_accept_callback); + tcp_arg(ConnectionContext->lwip_tcp_pcb, Irp); return STATUS_PENDING; } Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/address.h [iso-8859-1] Tue Jun 14 19:43:03 2016 @@ -1,8 +1,7 @@ #pragma once -typedef struct -{ +typedef struct _ADDRESS_FILE { LIST_ENTRY ListEntry; LONG RefCount; IPPROTO Protocol; @@ -14,9 +13,19 @@ { struct raw_pcb* lwip_raw_pcb; struct udp_pcb* lwip_udp_pcb; - struct tcp_pcb* lwip_tcp_pcb; + struct _TCP_CONTEXT *ConnectionContext; }; -} ADDRESS_FILE; +} ADDRESS_FILE, *PADDRESS_FILE; + +typedef struct _TCP_CONTEXT { + ADDRESS_FILE *AddressFile; + LIST_ENTRY ListEntry; + IPPROTO Protocol; + LONG RefCount; + KSPIN_LOCK Lock; + KIRQL OldIrql; + struct tcp_pcb* lwip_tcp_pcb; +} TCP_CONTEXT, *PTCP_CONTEXT; void TcpIpInitializeAddresses(void); @@ -26,6 +35,12 @@ _Inout_ PIRP Irp, _In_ PTDI_ADDRESS_IP Address, _In_ IPPROTO Protocol +); + +NTSTATUS +TcpIpCreateContext( + _Inout_ PIRP Irp, + _In_ IPPROTO Protocol ); NTSTATUS Modified: branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP/drivers/network/… ============================================================================== --- branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP/drivers/network/tcpip/main.c [iso-8859-1] Tue Jun 14 19:43:03 2016 @@ -210,8 +210,12 @@ NTSTATUS Status; PFILE_FULL_EA_INFORMATION FileInfo; IPPROTO Protocol; +// ADDRESS_FILE *AddressFile; + + ULONG *temp; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - + /* Grab the info describing the file */ FileInfo = Irp->AssociatedIrp.SystemBuffer; @@ -223,13 +227,15 @@ Status = STATUS_SUCCESS; goto Quickie; } - + /* Validate it */ switch (FileInfo->EaNameLength) { case TDI_TRANSPORT_ADDRESS_LENGTH: { PTA_IP_ADDRESS Address; + + DPRINT1("TCPIP Create Transport Address\n"); if (strncmp(&FileInfo->EaName[0], TdiTransportAddress, TDI_TRANSPORT_ADDRESS_LENGTH) != 0) { @@ -259,20 +265,37 @@ } /* All good. */ - Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); + temp = (ULONG*)Address; + DPRINT1("\nPTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", + temp[7], temp[6], temp[5], temp[4], + temp[3], temp[2], temp[1], temp[0]); + Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); + if (Status != STATUS_SUCCESS) + { + goto Quickie; + } + +/* AddressFile = IrpSp->FileObject->FsContext; + tcp_bind(AddressFile->lwip_tcp_pcb, + (ip_addr_t*)&AddressFile->Address.in_addr, + AddressFile->Address.sin_port);*/ + DPRINT1("\nPTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", + temp[7], temp[6], temp[5], temp[4], + temp[3], temp[2], temp[1], temp[0]); break; } case TDI_CONNECTION_CONTEXT_LENGTH: { PTA_IP_ADDRESS Address; + + DPRINT1("TCPIP Create connection Context\n"); if (strncmp(&FileInfo->EaName[0], TdiConnectionContext, TDI_CONNECTION_CONTEXT_LENGTH) != 0) { DPRINT1("TCPIP: Should maybe open file %*s.\n", FileInfo->EaNameLength, &FileInfo->EaName[0]); return STATUS_INVALID_PARAMETER; } - DPRINT1("Should create a connection!\n"); Address = (PTA_IP_ADDRESS)(&FileInfo->EaName[FileInfo->EaNameLength + 1]); @@ -284,8 +307,19 @@ goto Quickie; } + temp = (ULONG*)Protocol; + DPRINT1("\n Protocol: %08x\n", temp); + + temp = (ULONG*)Address; + /* All good. */ - Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); + DPRINT1("\n PTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", + temp[7], temp[6], temp[5], temp[4], + temp[3], temp[2], temp[1], temp[0]); + Status = TcpIpCreateContext(Irp, Protocol); + DPRINT1("\n PTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", + temp[7], temp[6], temp[5], temp[4], + temp[3], temp[2], temp[1], temp[0]); break; } @@ -319,7 +353,7 @@ PIO_STACK_LOCATION IrpSp; NTSTATUS Status; ULONG_PTR FileType; - + IrpSp = IoGetCurrentIrpStackLocation(Irp); FileType = (ULONG_PTR)IrpSp->FileObject->FsContext2; @@ -327,6 +361,8 @@ switch (FileType) { case TDI_TRANSPORT_ADDRESS_FILE: + DPRINT1("TCPIP Close Transport Address\n"); + if (!IrpSp->FileObject->FsContext) { DPRINT1("TCPIP: Got a close request without a file to close!\n"); @@ -362,6 +398,8 @@ NTSTATUS Status; PIO_STACK_LOCATION IrpSp; + DPRINT1("TcpIpDispatchInternal\n"); + IrpSp = IoGetCurrentIrpStackLocation(Irp); switch (IrpSp->MinorFunction) @@ -372,6 +410,7 @@ break; case TDI_RECEIVE_DATAGRAM: + DPRINT1("TCPIP: TDI_RECEIVE_DATAGRAM!\n"); return TcpIpReceiveDatagram(Irp); case TDI_SEND: @@ -380,6 +419,7 @@ break; case TDI_SEND_DATAGRAM: + DPRINT1("TCPIP: TDI_SEND_DATAGRAM!\n"); return TcpIpSendDatagram(Irp); case TDI_ACCEPT: @@ -394,7 +434,7 @@ case TDI_CONNECT: DPRINT1("TCPIP: TDI_CONNECT!\n"); - Status = TcpIpConnect(Irp); + Status = TcpIpConnect(Irp); break; case TDI_DISCONNECT: @@ -413,6 +453,7 @@ break; case TDI_QUERY_INFORMATION: + DPRINT1("TCPIP: TDI_QUERY_INFORMATION\n"); return TcpIpQueryKernelInformation(Irp); case TDI_SET_INFORMATION: @@ -459,7 +500,7 @@ { NTSTATUS Status; PIO_STACK_LOCATION IrpSp; - + IrpSp = IoGetCurrentIrpStackLocation(Irp); Irp->IoStatus.Information = 0; @@ -468,26 +509,26 @@ { case IOCTL_TCP_QUERY_INFORMATION_EX: Status = TcpIpQueryInformation(Irp); - break; - - case IOCTL_TCP_SET_INFORMATION_EX: - Status = TcpIpSetInformation(Irp); - break; - - case IOCTL_SET_IP_ADDRESS: - DPRINT1("TCPIP: Should handle IOCTL_SET_IP_ADDRESS.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case IOCTL_DELETE_IP_ADDRESS: - DPRINT1("TCPIP: Should handle IOCTL_DELETE_IP_ADDRESS.\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT1("TCPIP: Unknown IOCTL 0x%#x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); - Status = STATUS_NOT_IMPLEMENTED; - break; + break; + + case IOCTL_TCP_SET_INFORMATION_EX: + Status = TcpIpSetInformation(Irp); + break; + + case IOCTL_SET_IP_ADDRESS: + DPRINT1("TCPIP: Should handle IOCTL_SET_IP_ADDRESS.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case IOCTL_DELETE_IP_ADDRESS: + DPRINT1("TCPIP: Should handle IOCTL_DELETE_IP_ADDRESS.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + DPRINT1("TCPIP: Unknown IOCTL 0x%#x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_IMPLEMENTED; + break; } //DPRINT("TCPIP dispatched with status 0x%08x.\n", Status);

8 years, 7 months

[gedmurphy] 71636: [NTOS] - Properly implement ObpValidateAccessMask - If the security descriptor has a system acl, the caller will need access to it

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 14 18:01:02 2016 New Revision: 71636 URL: http://svn.reactos.org/svn/reactos?rev=71636&view=rev Log: [NTOS] - Properly implement ObpValidateAccessMask - If the security descriptor has a system acl, the caller will need access to it Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Tue Jun 14 18:01:02 2016 @@ -484,7 +484,22 @@ NTAPI ObpValidateAccessMask(IN PACCESS_STATE AccessState) { - /* TODO */ + PISECURITY_DESCRIPTOR SecurityDescriptor; + + /* We're only interested if the object for this access state has an SD */ + SecurityDescriptor = AccessState->SecurityDescriptor; + if (SecurityDescriptor) + { + /* Check if the SD has a system ACL but hasn't been granted access to get/set it */ + if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && + !(AccessState->PreviouslyGrantedAccess & ACCESS_SYSTEM_SECURITY)) + { + /* We're gonna need access */ + AccessState->RemainingDesiredAccess |= ACCESS_SYSTEM_SECURITY; + } + } + + /* This can't fail */ return STATUS_SUCCESS; }

8 years, 7 months

[hbelusca] 71635: [SHELL32] - Use similar shell def-view window styles as on Windows. - Add a "hack" to force the shell progman desktop window to get its correct window name, when running our shell...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 13 20:27:57 2016 New Revision: 71635 URL: http://svn.reactos.org/svn/reactos?rev=71635&view=rev Log: [SHELL32] - Use similar shell def-view window styles as on Windows. - Add a "hack" to force the shell progman desktop window to get its correct window name, when running our shell on Windows. I don't know why calling CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, ...) with a valid szProgmanWindowName string still persists in setting the window name to NULL... If someone has an idea, please let me know! - Addendum to CORE-11375: Create the shell desktop view with the same size as the current desktop's workarea. Confirmed with ApiMonitor on Windows. I add some "FIXME" to make future developers think about possible improvements in the code. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Jun 13 20:27:57 2016 @@ -271,7 +271,7 @@ { static ATL::CWndClassInfo wc = { - { sizeof(WNDCLASSEX), 0, StartWindowProc, + { sizeof(WNDCLASSEX), CS_PARENTDC, StartWindowProc, 0, 0, NULL, NULL, LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_WINDOW + 1), NULL, SV_CLASS_NAME, NULL }, @@ -2145,7 +2145,7 @@ TRACE("-- CommDlgBrowser\n"); } - Create(m_hWndParent, prcView, NULL, WS_CHILD | WS_TABSTOP, 0, 0U); + Create(m_hWndParent, prcView, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, 0, 0U); if (m_hWnd == NULL) return E_FAIL; Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Mon Jun 13 20:27:57 2016 @@ -194,17 +194,28 @@ BOOL CDesktopBrowser::CreateDeskWnd() { FOLDERSETTINGS fs; - RECT rcClient; + RECT rcWorkArea; HRESULT hRet; - if (!GetClientRect(hWnd, &rcClient)) - { - return FALSE; - } + // FIXME: Add support for multi-monitor? + SystemParametersInfoW(SPI_GETWORKAREA, + 0, &rcWorkArea, 0); + + // TODO: Call GetClientRect for the tray window and make small computation + // to be sure the tray window rect is removed from the work area! +#if 0 + RECT rcTray; + HWND hWndTray; + + /* Get client rect of the taskbar */ + hRet = ShellDesk->GetTrayWindow(&hWndTray); + if (SUCCEEDED(hRet)) + GetClientRect(hWndTray, &rcTray); +#endif fs.ViewMode = FVM_ICON; fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcClient, &hWndShellView); + hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcWorkArea, &hWndShellView); if (!SUCCEEDED(hRet)) return FALSE; @@ -491,6 +502,8 @@ RECT rcWorkArea; // FIXME: Add support for multi-monitor! + // FIXME: Maybe merge with the code that retrieves the + // work area in CDesktopBrowser::CreateDeskWnd ? SystemParametersInfoW(SPI_GETWORKAREA, 0, &rcWorkArea, 0); @@ -518,6 +531,15 @@ case WM_NCCREATE: { LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; + + // FIXME: This is a "hack" to enforce the window title + // to be set to what it should be *on Windows* only. + // I don't understand why it is reset to NULL whereas + // the creation of the progman window proper is done in + // the standard way... (05/06/2016, hbelusca). + // + ::SetWindowTextW(hwnd, CreateStruct->lpszName); + pThis = SHDESK_Create(hwnd, CreateStruct); if (pThis == NULL) { @@ -614,12 +636,18 @@ cy = GetSystemMetrics(SM_CYSCREEN); } - hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + hWndDesk = ::CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, x, y, cx, cy, NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); + if (hWndDesk != NULL) + { + ::ShowWindow(hWndDesk, SW_SHOW); + ::UpdateWindow(hWndDesk); + return (HANDLE)GetWindowLongPtrW(hWndDesk, 0); + } return NULL; }

8 years, 7 months

[ekohl] 71634: [SC] Merge the config functions into a single file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jun 13 20:01:47 2016 New Revision: 71634 URL: http://svn.reactos.org/svn/reactos?rev=71634&view=rev Log: [SC] Merge the config functions into a single file. Removed: trunk/reactos/base/applications/sc/qc.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/config.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Mon Jun 13 20:01:47 2016 @@ -9,7 +9,6 @@ description.c misc.c print.c - qc.c qfailure.c query.c sc.c Modified: trunk/reactos/base/applications/sc/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/confi… ============================================================================== --- trunk/reactos/base/applications/sc/config.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/config.c [iso-8859-1] Mon Jun 13 20:01:47 2016 @@ -8,6 +8,186 @@ */ #include "sc.h" + +BOOL QueryConfig(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; + LPWSTR lpPtr; + INT nLen, i; + +#ifdef SCDBG + _tprintf(_T("service to show configuration - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceConfig = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceConfig == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + pServiceConfig, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" TYPE : %-3lx "), pServiceConfig->dwServiceType); + switch (pServiceConfig->dwServiceType) + { + case SERVICE_KERNEL_DRIVER: + _tprintf(_T("KERNEL_DRIVER\n")); + break; + + case SERVICE_FILE_SYSTEM_DRIVER: + _tprintf(_T("FILE_SYSTEM_DRIVER\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" START_TYPE : %-3lx "), pServiceConfig->dwStartType); + switch (pServiceConfig->dwStartType) + { + case SERVICE_BOOT_START: + _tprintf(_T("BOOT_START\n")); + break; + + case SERVICE_SYSTEM_START: + _tprintf(_T("SYSTEM_START\n")); + break; + + case SERVICE_AUTO_START: + _tprintf(_T("AUTO_START\n")); + break; + + case SERVICE_DEMAND_START: + _tprintf(_T("DEMAND_START\n")); + break; + + case SERVICE_DISABLED: + _tprintf(_T("DISABLED\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" ERROR_CONTROL : %-3lx "), pServiceConfig->dwErrorControl); + switch (pServiceConfig->dwErrorControl) + { + case SERVICE_ERROR_IGNORE: + _tprintf(_T("IGNORE\n")); + break; + + case SERVICE_ERROR_NORMAL: + _tprintf(_T("NORMAL\n")); + break; + + case SERVICE_ERROR_SEVERE: + _tprintf(_T("SEVERE\n")); + break; + + case SERVICE_ERROR_CRITICAL: + _tprintf(_T("CRITICAL\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" BINARY_PATH_NAME : %s\n"), pServiceConfig->lpBinaryPathName); + _tprintf(_T(" LOAD_ORDER_GROUP : %s\n"), pServiceConfig->lpLoadOrderGroup); + _tprintf(_T(" TAG : %lu\n"), pServiceConfig->dwTagId); + _tprintf(_T(" DISPLAY_NAME : %s\n"), pServiceConfig->lpDisplayName); + _tprintf(_T(" DEPENDENCIES : ")); + lpPtr = pServiceConfig->lpDependencies; + i = 0; + while (*lpPtr != _T('\0')) + { + nLen = _tcslen(lpPtr); + if (i != 0) + _tprintf(_T("\n : ")); + _tprintf(_T("%s"), lpPtr); + lpPtr = lpPtr + nLen + 1; + i++; + } + _tprintf(_T("\n")); + + _tprintf(_T(" SERVICE_START_NAME : %s\n"), pServiceConfig->lpServiceStartName); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceConfig != NULL) + HeapFree(GetProcessHeap(), 0, pServiceConfig); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} BOOL SetConfig(LPCTSTR *ServiceArgs, INT ArgCount) { Removed: trunk/reactos/base/applications/sc/qc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/qc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/qc.c (removed) @@ -1,190 +0,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/sc/qc.c - * PURPOSE: Show the service configuration - * COPYRIGHT: Copyright 2016 Eric Kohl - * - */ - -#include "sc.h" - -BOOL QueryConfig(LPCTSTR ServiceName) -{ - SC_HANDLE hManager = NULL; - SC_HANDLE hService = NULL; - BOOL bResult = TRUE; - DWORD cbBytesNeeded = 0; - LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; - LPWSTR lpPtr; - INT nLen, i; - -#ifdef SCDBG - _tprintf(_T("service to show configuration - %s\n\n"), ServiceName); -#endif - - hManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); - if (hManager == NULL) - { - bResult = FALSE; - goto done; - } - - hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); - if (hService == NULL) - { - bResult = FALSE; - goto done; - } - - if (!QueryServiceConfig(hService, - NULL, - 0, - &cbBytesNeeded)) - { - if (cbBytesNeeded == 0) - { - bResult = FALSE; - goto done; - } - } - - pServiceConfig = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); - if (pServiceConfig == NULL) - { - SetLastError(ERROR_OUTOFMEMORY); - bResult = FALSE; - goto done; - } - - if (!QueryServiceConfig(hService, - pServiceConfig, - cbBytesNeeded, - &cbBytesNeeded)) - { - bResult = FALSE; - goto done; - } - - _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); - _tprintf(_T(" TYPE : %-3lx "), pServiceConfig->dwServiceType); - switch (pServiceConfig->dwServiceType) - { - case SERVICE_KERNEL_DRIVER: - _tprintf(_T("KERNEL_DRIVER\n")); - break; - - case SERVICE_FILE_SYSTEM_DRIVER: - _tprintf(_T("FILE_SYSTEM_DRIVER\n")); - break; - - case SERVICE_WIN32_OWN_PROCESS: - _tprintf(_T("WIN32_OWN_PROCESS\n")); - break; - - case SERVICE_WIN32_SHARE_PROCESS: - _tprintf(_T("WIN32_SHARE_PROCESS\n")); - break; - - case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: - _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); - break; - - case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: - _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); - break; - - default: - _tprintf(_T("\n")); - break; - } - - _tprintf(_T(" START_TYPE : %-3lx "), pServiceConfig->dwStartType); - switch (pServiceConfig->dwStartType) - { - case SERVICE_BOOT_START: - _tprintf(_T("BOOT_START\n")); - break; - - case SERVICE_SYSTEM_START: - _tprintf(_T("SYSTEM_START\n")); - break; - - case SERVICE_AUTO_START: - _tprintf(_T("AUTO_START\n")); - break; - - case SERVICE_DEMAND_START: - _tprintf(_T("DEMAND_START\n")); - break; - - case SERVICE_DISABLED: - _tprintf(_T("DISABLED\n")); - break; - - default: - _tprintf(_T("\n")); - break; - } - - _tprintf(_T(" ERROR_CONTROL : %-3lx "), pServiceConfig->dwErrorControl); - switch (pServiceConfig->dwErrorControl) - { - case SERVICE_ERROR_IGNORE: - _tprintf(_T("IGNORE\n")); - break; - - case SERVICE_ERROR_NORMAL: - _tprintf(_T("NORMAL\n")); - break; - - case SERVICE_ERROR_SEVERE: - _tprintf(_T("SEVERE\n")); - break; - - case SERVICE_ERROR_CRITICAL: - _tprintf(_T("CRITICAL\n")); - break; - - default: - _tprintf(_T("\n")); - break; - } - - _tprintf(_T(" BINARY_PATH_NAME : %s\n"), pServiceConfig->lpBinaryPathName); - _tprintf(_T(" LOAD_ORDER_GROUP : %s\n"), pServiceConfig->lpLoadOrderGroup); - _tprintf(_T(" TAG : %lu\n"), pServiceConfig->dwTagId); - _tprintf(_T(" DISPLAY_NAME : %s\n"), pServiceConfig->lpDisplayName); - _tprintf(_T(" DEPENDENCIES : ")); - lpPtr = pServiceConfig->lpDependencies; - i = 0; - while (*lpPtr != _T('\0')) - { - nLen = _tcslen(lpPtr); - if (i != 0) - _tprintf(_T("\n : ")); - _tprintf(_T("%s"), lpPtr); - lpPtr = lpPtr + nLen + 1; - i++; - } - _tprintf(_T("\n")); - - _tprintf(_T(" SERVICE_START_NAME : %s\n"), pServiceConfig->lpServiceStartName); - -done: - if (bResult == FALSE) - ReportLastError(); - - if (pServiceConfig != NULL) - HeapFree(GetProcessHeap(), 0, pServiceConfig); - - if (hService) - CloseServiceHandle(hService); - - if (hManager) - CloseServiceHandle(hManager); - - return bResult; -}

8 years, 7 months

[ekohl] 71633: [SC] - Move ParseCreateArguments to the misc.c file, rename it to ParseCreateConfigArguments and tweak it for use in the config command. - Implement the config command.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jun 13 19:43:02 2016 New Revision: 71633 URL: http://svn.reactos.org/svn/reactos?rev=71633&view=rev Log: [SC] - Move ParseCreateArguments to the misc.c file, rename it to ParseCreateConfigArguments and tweak it for use in the config command. - Implement the config command. Added: trunk/reactos/base/applications/sc/config.c (with props) trunk/reactos/base/applications/sc/misc.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/create.c trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -2,10 +2,12 @@ add_definitions(-DDEFINE_GUID) list(APPEND SOURCE + config.c control.c create.c delete.c description.c + misc.c print.c qc.c qfailure.c Added: trunk/reactos/base/applications/sc/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/confi… ============================================================================== --- trunk/reactos/base/applications/sc/config.c (added) +++ trunk/reactos/base/applications/sc/config.c [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -0,0 +1,89 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/config.c + * PURPOSE: Set the service configuration + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SetConfig(LPCTSTR *ServiceArgs, INT ArgCount) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + SERVICE_CREATE_INFO ServiceInfo; + + if (!ParseCreateConfigArguments(ServiceArgs, ArgCount, TRUE, &ServiceInfo)) + { + SetConfigUsage(); + return FALSE; + } + +#ifdef SCDBG + _tprintf(_T("service name - %s\n"), ServiceInfo.lpServiceName); + _tprintf(_T("display name - %s\n"), ServiceInfo.lpDisplayName); + _tprintf(_T("service type - %lu\n"), ServiceInfo.dwServiceType); + _tprintf(_T("start type - %lu\n"), ServiceInfo.dwStartType); + _tprintf(_T("error control - %lu\n"), ServiceInfo.dwErrorControl); + _tprintf(_T("Binary path - %s\n"), ServiceInfo.lpBinaryPathName); + _tprintf(_T("load order group - %s\n"), ServiceInfo.lpLoadOrderGroup); + _tprintf(_T("tag - %lu\n"), ServiceInfo.dwTagId); + _tprintf(_T("dependencies - %s\n"), ServiceInfo.lpDependencies); + _tprintf(_T("account start name - %s\n"), ServiceInfo.lpServiceStartName); + _tprintf(_T("account password - %s\n"), ServiceInfo.lpPassword); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + _tprintf(_T("[SC] OpenSCManager FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, + ServiceInfo.lpServiceName, + SERVICE_CHANGE_CONFIG); + if (hService == NULL) + { + _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + if (!ChangeServiceConfig(hService, + ServiceInfo.dwServiceType, + ServiceInfo.dwStartType, + ServiceInfo.dwErrorControl, + ServiceInfo.lpBinaryPathName, + ServiceInfo.lpLoadOrderGroup, + ServiceInfo.bTagId ? &ServiceInfo.dwTagId : NULL, + ServiceInfo.lpDependencies, + ServiceInfo.lpServiceStartName, + ServiceInfo.lpPassword, + ServiceInfo.lpDisplayName)) + { + _tprintf(_T("[SC] ChangeServiceConfig FAILED %lu:\n\n"), GetLastError()); + bResult = FALSE; + goto done; + } + + _tprintf(_T("[SC] ChangeServiceConfig SUCCESS\n\n")); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/config.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/creat… ============================================================================== --- trunk/reactos/base/applications/sc/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/create.c [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -10,163 +10,6 @@ #include "sc.h" -typedef struct -{ - LPCTSTR lpOption; - DWORD dwValue; -} OPTION_INFO; - -typedef struct -{ - LPCTSTR lpServiceName; - LPCTSTR lpDisplayName; - DWORD dwServiceType; - DWORD dwStartType; - DWORD dwErrorControl; - LPCTSTR lpBinaryPathName; - LPCTSTR lpLoadOrderGroup; - DWORD dwTagId; - LPCTSTR lpDependencies; - LPCTSTR lpServiceStartName; - LPCTSTR lpPassword; - - BOOL bTagId; -} SERVICE_CREATE_INFO, *LPSERVICE_CREATE_INFO; - - -static const OPTION_INFO TypeOpts[] = -{ - { _T("own"), SERVICE_WIN32_OWN_PROCESS }, - { _T("share"), SERVICE_WIN32_SHARE_PROCESS }, - { _T("interact"), SERVICE_INTERACTIVE_PROCESS }, - { _T("kernel"), SERVICE_KERNEL_DRIVER }, - { _T("filesys"), SERVICE_FILE_SYSTEM_DRIVER }, - { _T("rec"), SERVICE_RECOGNIZER_DRIVER } -}; - -static const OPTION_INFO StartOpts[] = -{ - { _T("boot"), SERVICE_BOOT_START }, - { _T("system"), SERVICE_SYSTEM_START }, - { _T("auto"), SERVICE_AUTO_START }, - { _T("demand"), SERVICE_DEMAND_START }, - { _T("disabled"), SERVICE_DISABLED } -}; - -static const OPTION_INFO ErrorOpts[] = -{ - { _T("normal"), SERVICE_ERROR_NORMAL }, - { _T("severe"), SERVICE_ERROR_SEVERE }, - { _T("critical"), SERVICE_ERROR_CRITICAL }, - { _T("ignore"), SERVICE_ERROR_IGNORE } -}; - -static const OPTION_INFO TagOpts[] = -{ - { _T("yes"), TRUE }, - { _T("no"), FALSE } -}; - - -static BOOL ParseCreateArguments( - LPCTSTR *ServiceArgs, - INT ArgCount, - OUT LPSERVICE_CREATE_INFO lpServiceInfo -) -{ - INT i, ArgIndex = 1; - - if (ArgCount < 1) - return FALSE; - - ZeroMemory(lpServiceInfo, sizeof(SERVICE_CREATE_INFO)); - - lpServiceInfo->lpServiceName = ServiceArgs[0]; - - ArgCount--; - - while (ArgCount > 1) - { - if (!lstrcmpi(ServiceArgs[ArgIndex], _T("type="))) - { - for (i = 0; i < sizeof(TypeOpts) / sizeof(TypeOpts[0]); i++) - if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TypeOpts[i].lpOption)) - { - lpServiceInfo->dwServiceType |= TypeOpts[i].dwValue; - break; - } - - if (i == sizeof(TypeOpts) / sizeof(TypeOpts[0])) - break; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("start="))) - { - for (i = 0; i < sizeof(StartOpts) / sizeof(StartOpts[0]); i++) - if (!lstrcmpi(ServiceArgs[ArgIndex + 1], StartOpts[i].lpOption)) - { - lpServiceInfo->dwStartType = StartOpts[i].dwValue; - break; - } - - if (i == sizeof(StartOpts) / sizeof(StartOpts[0])) - break; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("error="))) - { - for (i = 0; i < sizeof(ErrorOpts) / sizeof(ErrorOpts[0]); i++) - if (!lstrcmpi(ServiceArgs[ArgIndex + 1], ErrorOpts[i].lpOption)) - { - lpServiceInfo->dwErrorControl = ErrorOpts[i].dwValue; - break; - } - - if (i == sizeof(ErrorOpts) / sizeof(ErrorOpts[0])) - break; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("tag="))) - { - for (i = 0; i < sizeof(TagOpts) / sizeof(TagOpts[0]); i++) - if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TagOpts[i].lpOption)) - { - lpServiceInfo->bTagId = TagOpts[i].dwValue; - break; - } - - if (i == sizeof(TagOpts) / sizeof(TagOpts[0])) - break; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("binpath="))) - { - lpServiceInfo->lpBinaryPathName = ServiceArgs[ArgIndex + 1]; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("group="))) - { - lpServiceInfo->lpLoadOrderGroup = ServiceArgs[ArgIndex + 1]; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("depend="))) - { - lpServiceInfo->lpDependencies = ServiceArgs[ArgIndex + 1]; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("obj="))) - { - lpServiceInfo->lpServiceStartName = ServiceArgs[ArgIndex + 1]; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("displayname="))) - { - lpServiceInfo->lpDisplayName = ServiceArgs[ArgIndex + 1]; - } - else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("password="))) - { - lpServiceInfo->lpPassword = ServiceArgs[ArgIndex + 1]; - } - - ArgIndex += 2; - ArgCount -= 2; - } - - return (ArgCount == 0); -} - BOOL Create(LPCTSTR *ServiceArgs, INT ArgCount) { SC_HANDLE hSCManager; @@ -178,7 +21,7 @@ LPTSTR lpBuffer = NULL; SERVICE_CREATE_INFO ServiceInfo; - if (!ParseCreateArguments(ServiceArgs, ArgCount, &ServiceInfo)) + if (!ParseCreateConfigArguments(ServiceArgs, ArgCount, FALSE, &ServiceInfo)) { CreateUsage(); return FALSE; Added: trunk/reactos/base/applications/sc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/misc.… ============================================================================== --- trunk/reactos/base/applications/sc/misc.c (added) +++ trunk/reactos/base/applications/sc/misc.c [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -0,0 +1,160 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/misc.c + * PURPOSE: Various functions + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * Roel Messiant <roelmessiant(a)gmail.com> + */ + +#include "sc.h" + +typedef struct +{ + LPCTSTR lpOption; + DWORD dwValue; +} OPTION_INFO; + +static const OPTION_INFO TypeOpts[] = +{ + { _T("own"), SERVICE_WIN32_OWN_PROCESS }, + { _T("share"), SERVICE_WIN32_SHARE_PROCESS }, + { _T("interact"), SERVICE_INTERACTIVE_PROCESS }, + { _T("kernel"), SERVICE_KERNEL_DRIVER }, + { _T("filesys"), SERVICE_FILE_SYSTEM_DRIVER }, + { _T("rec"), SERVICE_RECOGNIZER_DRIVER } +}; + +static const OPTION_INFO StartOpts[] = +{ + { _T("boot"), SERVICE_BOOT_START }, + { _T("system"), SERVICE_SYSTEM_START }, + { _T("auto"), SERVICE_AUTO_START }, + { _T("demand"), SERVICE_DEMAND_START }, + { _T("disabled"), SERVICE_DISABLED } +}; + +static const OPTION_INFO ErrorOpts[] = +{ + { _T("normal"), SERVICE_ERROR_NORMAL }, + { _T("severe"), SERVICE_ERROR_SEVERE }, + { _T("critical"), SERVICE_ERROR_CRITICAL }, + { _T("ignore"), SERVICE_ERROR_IGNORE } +}; + +static const OPTION_INFO TagOpts[] = +{ + { _T("yes"), TRUE }, + { _T("no"), FALSE } +}; + + +BOOL +ParseCreateConfigArguments( + LPCTSTR *ServiceArgs, + INT ArgCount, + BOOL bChangeService, + OUT LPSERVICE_CREATE_INFO lpServiceInfo) +{ + INT i, ArgIndex = 1; + + if (ArgCount < 1) + return FALSE; + + ZeroMemory(lpServiceInfo, sizeof(SERVICE_CREATE_INFO)); + + if (bChangeService) + { + lpServiceInfo->dwServiceType = SERVICE_NO_CHANGE; + lpServiceInfo->dwStartType = SERVICE_NO_CHANGE; + lpServiceInfo->dwErrorControl = SERVICE_NO_CHANGE; + } + + lpServiceInfo->lpServiceName = ServiceArgs[0]; + + ArgCount--; + + while (ArgCount > 1) + { + if (!lstrcmpi(ServiceArgs[ArgIndex], _T("type="))) + { + for (i = 0; i < sizeof(TypeOpts) / sizeof(TypeOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TypeOpts[i].lpOption)) + { + if (lpServiceInfo->dwServiceType == SERVICE_NO_CHANGE) + lpServiceInfo->dwServiceType = TypeOpts[i].dwValue; + else + lpServiceInfo->dwServiceType |= TypeOpts[i].dwValue; + break; + } + + if (i == sizeof(TypeOpts) / sizeof(TypeOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("start="))) + { + for (i = 0; i < sizeof(StartOpts) / sizeof(StartOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], StartOpts[i].lpOption)) + { + lpServiceInfo->dwStartType = StartOpts[i].dwValue; + break; + } + + if (i == sizeof(StartOpts) / sizeof(StartOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("error="))) + { + for (i = 0; i < sizeof(ErrorOpts) / sizeof(ErrorOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], ErrorOpts[i].lpOption)) + { + lpServiceInfo->dwErrorControl = ErrorOpts[i].dwValue; + break; + } + + if (i == sizeof(ErrorOpts) / sizeof(ErrorOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("tag="))) + { + for (i = 0; i < sizeof(TagOpts) / sizeof(TagOpts[0]); i++) + if (!lstrcmpi(ServiceArgs[ArgIndex + 1], TagOpts[i].lpOption)) + { + lpServiceInfo->bTagId = TagOpts[i].dwValue; + break; + } + + if (i == sizeof(TagOpts) / sizeof(TagOpts[0])) + break; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("binpath="))) + { + lpServiceInfo->lpBinaryPathName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("group="))) + { + lpServiceInfo->lpLoadOrderGroup = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("depend="))) + { + lpServiceInfo->lpDependencies = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("obj="))) + { + lpServiceInfo->lpServiceStartName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("displayname="))) + { + lpServiceInfo->lpDisplayName = ServiceArgs[ArgIndex + 1]; + } + else if (!lstrcmpi(ServiceArgs[ArgIndex], _T("password="))) + { + lpServiceInfo->lpPassword = ServiceArgs[ArgIndex + 1]; + } + + ArgIndex += 2; + ArgCount -= 2; + } + + return (ArgCount == 0); +} Propchange: trunk/reactos/base/applications/sc/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -264,6 +264,10 @@ else SetDescriptionUsage(); } + else if (!lstrcmpi(Command, _T("config"))) + { + SetConfig(ServiceArgs, ArgCount); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -11,6 +11,24 @@ #define SCDBG +typedef struct +{ + LPCTSTR lpServiceName; + LPCTSTR lpDisplayName; + DWORD dwServiceType; + DWORD dwStartType; + DWORD dwErrorControl; + LPCTSTR lpBinaryPathName; + LPCTSTR lpLoadOrderGroup; + DWORD dwTagId; + LPCTSTR lpDependencies; + LPCTSTR lpServiceStartName; + LPCTSTR lpPassword; + + BOOL bTagId; +} SERVICE_CREATE_INFO, *LPSERVICE_CREATE_INFO; + + /* control functions */ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount); BOOL Create(LPCTSTR *ServiceArgs, INT ArgCount); @@ -22,6 +40,7 @@ BOOL SdShow(LPCTSTR ServiceName); BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); BOOL QueryConfig(LPCTSTR ServiceName); +BOOL SetConfig(LPCTSTR *ServiceArgs, INT ArgCount); BOOL QueryDescription(LPCTSTR ServiceName); BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description); BOOL QueryFailure(LPCTSTR ServiceName); @@ -30,6 +49,14 @@ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); VOID ReportLastError(VOID); +/* misc.c */ +BOOL +ParseCreateConfigArguments( + LPCTSTR *ServiceArgs, + INT ArgCount, + BOOL bChangeService, + OUT LPSERVICE_CREATE_INFO lpServiceInfo); + /* usage functions */ VOID MainUsage(VOID); VOID StartUsage(VOID); @@ -37,8 +64,6 @@ VOID InterrogateUsage(VOID); VOID ContinueUsage(VOID); VOID StopUsage(VOID); -VOID ConfigUsage(VOID); -VOID DescriptionUsage(VOID); VOID DeleteUsage(VOID); VOID CreateUsage(VOID); VOID ControlUsage(VOID); @@ -48,5 +73,6 @@ VOID QueryDescriptionUsage(VOID); VOID QueryFailureUsage(VOID); VOID SetDescriptionUsage(VOID); +VOID SetConfigUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Mon Jun 13 19:43:02 2016 @@ -33,7 +33,7 @@ _T("\t interrogate : Sends a INTERROGATE control request to a service.\n") _T("\t continue : Sends a CONTINUE control request to a service.\n") _T("\t stop : Sends a STOP request to a service.\n") -// "\t config : Changes the configuration of a service (persistant).\n" + _T("\t config : Changes the configuration of a service (persistant).\n") _T("\t description : Changes the description of a service.\n") // "\t failure : Changes the actions taken by a service upon failure.\n" _T("\t qc : Queries the configuration information for a service.\n") @@ -134,21 +134,6 @@ _T(" sc <server> continue [service name]\n")); } - -VOID ConfigUsage(VOID) -{ - _tprintf(_T("not yet implemented\n")); -} - - -VOID DescriptionUsage(VOID) -{ - _tprintf(_T("DESCRIPTION:\n") - _T(" Sets the description string for a service.\n") - _T("USAGE:\n") - _T(" sc <server> description [service name]\n")); -} - VOID DeleteUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") @@ -237,4 +222,24 @@ _T(" Sets the description string of a service.\n") _T("USAGE:\n") _T(" sc <server> description [service name] [description]\n")); -} +} + +VOID SetConfigUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Modifies a service entry in the registry and Service Database.\n") + _T("USAGE:\n") + _T(" sc <server> config [service name] <option1> <option2>...\n") + _T("CONFIG OPTIONS:\n") + _T(" NOTE: The option name includes the equal sign.\n") + _T(" type= <own|share|interact|kernel|filesys|rec>\n") + _T(" start= <boot|system|auto|demand|disabled>\n") + _T(" error= <normal|severe|critical|ignore>\n") + _T(" binPath= <BinaryPathName>\n") + _T(" group= <LoadOrderGroup>\n") + _T(" tag= <yes|no>\n") + _T(" depend= <Dependencies(separated by / (forward slash))>\n") + _T(" obj= <AccountName|ObjectName>\n") + _T(" DisplayName= <display name>\n") + _T(" password= <password>\n")); +}

8 years, 7 months

[hbelusca] 71632: [SHELL32]: Fix some whitespace and comments.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 13 19:39:35 2016 New Revision: 71632 URL: http://svn.reactos.org/svn/reactos?rev=71632&view=rev Log: [SHELL32]: Fix some whitespace and comments. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Jun 13 19:39:35 2016 @@ -91,17 +91,17 @@ PCUITEMID_CHILD *m_apidl; PIDLIST_ABSOLUTE m_pidlParent; LISTVIEW_SORT_INFO m_sortInfo; - ULONG m_hNotify; /* change notification handle */ + ULONG m_hNotify; /* Change notification handle */ HACCEL m_hAccel; DWORD m_dwAspects; DWORD m_dwAdvf; CComPtr<IAdviseSink> m_pAdvSink; // for drag and drop - CComPtr<IDropTarget> m_pCurDropTarget; /* The sub-item, which is currently dragged over */ - CComPtr<IDataObject> m_pCurDataObject; /* The dragged data-object */ - LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ - UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ - POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ + CComPtr<IDropTarget> m_pCurDropTarget; /* The sub-item, which is currently dragged over */ + CComPtr<IDataObject> m_pCurDataObject; /* The dragged data-object */ + LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ + UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ // CComPtr<IContextMenu> m_pCM; @@ -245,7 +245,7 @@ // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - // message handlers + // Message handlers LRESULT OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); @@ -287,10 +287,10 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CDefView *pThis; - LRESULT result; - - // must hold a reference during message handling + CDefView *pThis; + LRESULT result; + + // Must hold a reference during message handling pThis = reinterpret_cast<CDefView *>(hWnd); pThis->AddRef(); result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam); @@ -345,9 +345,9 @@ #define ID_LISTVIEW 1 /*windowsx.h */ -#define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp) -#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp) -#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp) +#define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp) +#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp) +#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp) typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask); @@ -509,7 +509,8 @@ * - creates the list view window */ BOOL CDefView::CreateList() -{ DWORD dwStyle, dwExStyle; +{ + DWORD dwStyle, dwExStyle; TRACE("%p\n", this); @@ -618,8 +619,8 @@ */ BOOL CDefView::InitList() { - SHELLDETAILS sd; - WCHAR szTemp[50]; + SHELLDETAILS sd; + WCHAR szTemp[50]; HIMAGELIST big_icons, small_icons; TRACE("%p\n", this); @@ -715,7 +716,7 @@ */ BOOLEAN CDefView::LV_AddItem(PCUITEMID_CHILD pidl) { - LVITEMW lvItem; + LVITEMW lvItem; TRACE("(%p)(pidl=%p)\n", this, pidl); @@ -792,7 +793,7 @@ nItem = LV_FindItemByPidl(pidl); - if ( -1 != nItem ) + if (-1 != nItem) { lvItem.mask = LVIF_IMAGE; lvItem.iItem = nItem; @@ -813,7 +814,7 @@ * - sorts the list * - fills the list into the view */ -INT CALLBACK CDefView::fill_list( LPVOID ptr, LPVOID arg ) +INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg) { PITEMID_CHILD pidl = static_cast<PITEMID_CHILD>(ptr); CDefView *pThis = static_cast<CDefView *>(arg); @@ -975,15 +976,15 @@ */ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - CComPtr<IDropTarget> pdt; - SHChangeNotifyEntry ntreg; - CComPtr<IPersistFolder2> ppf2; + CComPtr<IDropTarget> pdt; + SHChangeNotifyEntry ntreg; + CComPtr<IPersistFolder2> ppf2; TRACE("%p\n", this); - if(CreateList()) - { - if(InitList()) + if (CreateList()) + { + if (InitList()) { FillList(); } @@ -1029,7 +1030,7 @@ HMENU hmenu = CreatePopupMenu(); - //FIXME: get proper numbers ? + // FIXME: get proper numbers ? const UINT first = 0x7800; const UINT last = 0x7A00; hr = cm->QueryContextMenu(hmenu, 0, first, last, 0); @@ -1237,11 +1238,10 @@ */ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - WORD x; - WORD y; - UINT uCommand; - HMENU hMenu; - HRESULT hResult; + WORD x, y; + UINT uCommand; + HMENU hMenu; + HRESULT hResult; // for some reason I haven't figured out, we sometimes recurse into this method if (m_pCM != NULL) @@ -1375,7 +1375,7 @@ } else { - if(m_hMenu) + if (m_hMenu) { if (!m_menusLoaded) { @@ -2069,24 +2069,22 @@ HRESULT WINAPI CDefView::UIActivate(UINT uState) { - /* - CHAR szName[MAX_PATH]; - */ - LRESULT lResult; - int nPartArray[1] = { -1}; + // CHAR szName[MAX_PATH]; + LRESULT lResult; + int nPartArray[1] = { -1}; TRACE("(%p)->(state=%x) stub\n", this, uState); - /*don't do anything if the state isn't really changing*/ + /* don't do anything if the state isn't really changing */ if (m_uState == uState) { return S_OK; } - /*OnActivate handles the menu merging and internal state*/ + /* OnActivate handles the menu merging and internal state */ DoActivate(uState); - /*only do This if we are active*/ + /* only do This if we are active */ if (uState != SVUIA_DEACTIVATE) { @@ -2118,7 +2116,7 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd) { - OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } }; + OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } }; *phWnd = 0; @@ -2133,14 +2131,14 @@ if (psb == NULL || m_hWnd) return E_UNEXPECTED; - /*set up the member variables*/ + /* Set up the member variables */ m_pShellBrowser = psb; m_FolderSettings = *lpfs; - /*get our parent window*/ + /* Get our parent window */ m_pShellBrowser->GetWindow(&m_hWndParent); - /* try to get the ICommDlgBrowserInterface, adds a reference !!! */ + /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ m_pCommDlgBrowser = NULL; if (SUCCEEDED(m_pShellBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &m_pCommDlgBrowser)))) { @@ -2177,7 +2175,7 @@ { TRACE("(%p)\n", this); - /*Make absolutely sure all our UI is cleaned up.*/ + /* Make absolutely sure all our UI is cleaned up */ UIActivate(SVUIA_DEACTIVATE); if (m_hAccel) @@ -3048,8 +3046,7 @@ HRESULT CDefView::_MergeToolbar() { - CComPtr<IExplorerToolbar> ptb; // [sp+8h] [bp-4h]@1 - + CComPtr<IExplorerToolbar> ptb; HRESULT hr = S_OK; hr = IUnknown_QueryService(m_pShellBrowser, IID_IExplorerToolbar, IID_PPV_ARG(IExplorerToolbar, &ptb)); Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Mon Jun 13 19:39:35 2016 @@ -131,9 +131,9 @@ HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx) { - CComPtr<IShellFolder> psfDesktopFolder; - CSFV csfv; - HRESULT hRet; + CComPtr<IShellFolder> psfDesktopFolder; + CSFV csfv; + HRESULT hRet; hWnd = hWndx; ShellDesk = ShellDeskx; @@ -160,9 +160,9 @@ static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) { - CComPtr<IShellDesktopTray> ShellDesk; - CComObject<CDesktopBrowser> *pThis; - HRESULT hRet; + CComPtr<IShellDesktopTray> ShellDesk; + CComObject<CDesktopBrowser> *pThis; + HRESULT hRet; ShellDesk = (IShellDesktopTray *)lpCreateStruct->lpCreateParams; if (ShellDesk == NULL) @@ -316,7 +316,7 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) { - HWND hWnd; + HWND hWnd; if (pret == NULL) return E_POINTER; @@ -396,13 +396,13 @@ LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) { - HWND hwndTray; - HRESULT hres; - - hres = this->ShellDesk->GetTrayWindow(&hwndTray); - - if (SUCCEEDED(hres)) - PostMessageW(hwndTray, uMsg, wParam, lParam); + HWND hWndTray; + HRESULT hRet; + + hRet = ShellDesk->GetTrayWindow(&hWndTray); + + if (SUCCEEDED(hRet)) + PostMessageW(hWndTray, uMsg, wParam, lParam); return 0; } @@ -550,6 +550,7 @@ case WM_SETFOCUS: SetFocus(pThis->hWndShellView); break; + default: DefMsgHandler: Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);

8 years, 7 months

[hbelusca] 71631: [TELNET]: Add russian translation by "amber". CORE-11411

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 13 19:18:36 2016 New Revision: 71631 URL: http://svn.reactos.org/svn/reactos?rev=71631&view=rev Log: [TELNET]: Add russian translation by "amber". CORE-11411 Added: trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/network/telnet/telnet.rc Added: trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc [iso-8859-1] Mon Jun 13 19:18:36 2016 @@ -0,0 +1,96 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + MSG_COPYRIGHT "Telnet Win32 v2.1b2, Copyright (C) 2000 Paul Brannan <pbranna(a)clemson.edu>\nand the team. This program comes with ABSOLUTELY NO WARRANTY; for details\nread LICENSE.TXT. " + MSG_COPYRIGHT_1 "This is free software, and you are welcome to redistribute\nit under certain conditions.\n\n" + MSG_USAGE "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: TELNET [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ][ÑÐ·ÐµÐ» [Ð¿Ð¾ÑÑ]]\n\n Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ\n -d:<Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°> ÐÐ°Ð¿Ð¸ÑÑÐ²Ð°ÑÑ Ð²ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐ°Ð¹Ð».\n ÑÐ·ÐµÐ» ÐÐ¼Ñ ÑÐ·Ð»Ð° Ð¸Ð»Ð¸ IP Ð°Ð´ÑÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ.\n" + MSG_USAGE_1 " Ð¿Ð¾ÑÑ â Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ° (Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ: 23)\n\n" + MSG_HELP "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÐºÑÐ°ÑÐ¸ÑÑ. ÐÐ¾Ð¼Ð°Ð½Ð´Ñ:\n \ncl[ose] Ð·Ð°ÐºÑÑÑÑ ÑÐµÐºÑÑÐµÐµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ\nop[en] Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ÑÐ·Ð»Ñ\nq[uit] Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· telnet\n" + MSG_HELP_1 "ke[ys] Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ/Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ \nse[t] Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ/Ð¿Ð¾ÐºÐ°Ð·Ð°ÑÑ Ð¾Ð¿ÑÐ¸Ð¸\nz Ð¿ÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ\n? h[elp] Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐ¿ÑÐ°Ð²ÐºÑ\n" + MSG_INVCMD "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°. ÐÐ²ÐµÐ´Ð¸ÑÐµ ? Ð´Ð»Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸.\n" + MSG_ERROR "%1 Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ.\n" + MSG_INFO "%1\n" + MSG_WARNING "%1\n" + MSG_TRYING "ÐÐ¾Ð¿ÑÑÐºÐ° %1.%2.%3.%4:%5...\n" + MSG_CONNECTED "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº %1. ÐÐ»Ñ Ð²ÑÑÐ¾Ð´Ð° Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ALT-%2.\n" + MSG_TERMBYREM "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÑÐ²Ð°Ð½Ð¾.\n" + MSG_KEYMAP "ÐÐ°Ð³ÑÑÐ·ÐºÐ° %1 Ð¸Ð· %2.\n" + MSG_ERRKEYMAP "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸.\n" + MSG_DUMPFILE "ÐÐ°Ð¿Ð¸ÑÑ Ð²ÑÐ²Ð¾Ð´Ð° Ð² ÑÐ°Ð¹Ð» %1.\n" + MSG_CONFIG "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¸Ð· %1.\n" + MSG_NOINI "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¸Ð· %1.\nÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ.\n" + MSG_BADVAL "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ %1.\n" + MSG_NOSPAWN "Unable to spawn process.\n" + MSG_RESOLVING "ÐÐ¾Ð¸ÑÐº ÑÐ·Ð»Ð°: %1..." + MSG_NOSERVICE "TCP ÑÐ»ÑÐ¶Ð±Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°: %1.\n" + MSG_SIZEALIAS "ÐÐ½Ð¸Ð¼Ð°Ð½Ð¸Ðµ: Ð Ð°Ð·Ð¼ÐµÑ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð° %1 ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ð¹, Ð¸Ð³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" + MSG_ERRPIPE "Error: unable to spawn process for pipe.\n" + MSG_BADUSAGE "ÐÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n" + MSG_ALREADYCONNECTED "Ð£Ð¶Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½ Ðº %1.\n" + MSG_WSAEINTR "ÐÑÐ·Ð¾Ð² ÑÑÐ½ÐºÑÐ¸Ð¸ Ð¿ÑÐµÑÐ²Ð°Ð½.\n" + MSG_WSAEBADF "WSAEBADF\n" + MSG_WSAEACCESS "ÐÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð² Ð´Ð¾ÑÑÑÐ¿Ðµ.\n" + MSG_WSAEDEFAULT "WSAEDEFAULT\n" + MSG_WSAEINVAL "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð°ÑÐ³ÑÐ¼ÐµÐ½Ñ.\n" + MSG_WSAEMFILE "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ð¾ÑÐºÑÑÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n" + MSG_WSAEWOULDBLOCK "Ð ÐµÑÑÑÑ Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½.\n" + MSG_WSAEINPROGRESS "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ ÑÐµÐ¹ÑÐ°Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÐµÑÑÑ.\n" + MSG_WSAEALREADY "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ ÑÐ¶Ðµ Ð¸Ð´ÐµÑ.\n" + MSG_WSAENOTSOCK "Socket operation on non-socket.\n" + MSG_WSAEDESTADDRREQ "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð°Ð´ÑÐµÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ.\n" + MSG_WSAEMSGSIZE "Ð¡Ð»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ.\n" + MSG_WSAEPROTOTYPE "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸Ð¿ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° Ð´Ð»Ñ ÑÐ¾ÐºÐµÑÐ°.\n" + MSG_WSAENOPROTOOPT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð°.\n" + MSG_WSAEPROTONOTSUPPORT "ÐÑÐ¾ÑÐ¾ÐºÐ¾Ð» Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + MSG_WSAESOCKNOTSUPPORT "Ð¢Ð¸Ð¿ ÑÐ¾ÐºÐµÑÐ° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + MSG_WSAEOPNOTSUPP "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + MSG_WSAEPFNOTSUPPORT "Ð¡ÐµÐ¼ÐµÐ¹ÑÑÐ²Ð¾ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð¾Ð² Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + MSG_WSAEAFNOTSUPPORT "Address family not supported by protocol family.\n" + MSG_WSAEADDRINUSE "ÐÐ´ÑÐµÑ ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ.\n" + MSG_WSAEADDRNOTAVAIL "ÐÐµ Ð¼Ð¾Ð³Ñ Ð½Ð°Ð·Ð½Ð°ÑÐ¸ÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐµÐ½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ.\n" + MSG_WSAENETDOWN "Ð¡ÐµÑÑ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð°.\n" + MSG_WSAENETUNREACH "Ð¡ÐµÑÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð°.\n" + MSG_WSAENETRESET "Network dropped connection on reset.\n" + MSG_WSAECONNABORTED "ÐÐ Ð²ÑÐ·Ð²Ð°Ð»Ð¾ ÑÐ°Ð·ÑÑÐ² ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ.\n" + MSG_WSAECONNRESET "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÑÐ²Ð°Ð½Ð¾.\n" + MSG_WSAENOBUFS "ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾Ð³Ð¾ Ð±ÑÑÐµÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð°.\n" + MSG_WSAEISCONN "Ð¡Ð¾ÐºÐµÑ ÑÐ¶Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½.\n" + MSG_WSAENOTCONN "Ð¡Ð¾ÐºÐµÑ Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½.\n" + MSG_WSAESHUTDOWN "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð¿Ð¾ÑÐ»Ðµ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ ÑÐ¾ÐºÐµÑÐ°.\n" + MSG_WSAETOOMANYREFS "WSAETOOMANYREFS\n" + MSG_WSAETIMEDOUT "ÐÑÐµÐ²ÑÑÐµÐ½Ð¾ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ.\n" + MSG_WSAECONNREFUSED "ÐÑÐºÐ°Ð· Ð² ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸.\n" + MSG_WSAELOOP "WSAELOOP\n" + MSG_WSAENAMETOOLONG "ÐÐ¼Ñ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ.\n" + MSG_WSAEHOSTDOWN "Ð£Ð·ÐµÐ» Ð¾ÑÐºÐ»ÑÑÐµÐ½.\n" + MSG_WSAEHOSTUNREACH "ÐÐµÑ Ð¼Ð°ÑÑÑÑÑÐ° Ðº ÑÐ·Ð»Ñ.\n" + MSG_WSAESYSNOTREADY "Ð¡ÐµÑÐµÐ²Ð°Ñ Ð¿Ð¾Ð´ÑÐ¸ÑÑÐµÐ¼Ð° Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð°.\n" + MSG_WSAVERNOTSUPPORTED "WINSOCK.DLL Ð½Ðµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ.\n" + MSG_WSANOTINITIALISED "WSAStartup ÐµÑÐµ Ð½Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð° ÑÑÐ¿ÐµÑÐ½Ð¾.\n" + MSG_WSAHOST_NOT_FOUND "Ð£Ð·ÐµÐ» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½.\n" + MSG_WSATRY_AGAIN "Non-authoritative host not found.\n" + MSG_WSANO_RECOVERY "ÐÑÐ¾ Ð½ÐµÑÑÑÑÐ°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°.\n" + MSG_WSANO_DATA "ÐÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ, Ð±ÐµÐ· Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð´Ð°Ð½Ð½ÑÑ ÑÑÐµÐ±ÑÐµÐ¼Ð¾Ð³Ð¾ ÑÐ¸Ð¿Ð°e.\n" + MSG_KEYNOVAL "[GLOBAL]: ÐÐµÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð´Ð»Ñ %1.\n" + MSG_KEYBADVAL "[GLOBAL]: ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ %1.\n" + MSG_KEYBADSTRUCT "%1: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ ÑÑÑÑÐºÑÑÑÐ°.\n" + MSG_KEYBADCHARS "%1: ÐÐµÐ²ÐµÑÐ½ÑÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ? %1 -> %3.\n" + MSG_KEYUNEXPLINE "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° ""%1"".\n" + MSG_KEYUNEXPEOF "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½ÑÐ¹ ÐºÐ¾Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð°.\n" + MSG_KEYUNEXPTOK "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð» %1.\n" + MSG_KEYUNEXPTOKIN "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½ÑÐ¹ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð² %1.\n" + MSG_KEYUNEXP "ÐÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½ÑÐ¹ ÐºÐ¾Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð».\n" + MSG_KEYNOGLOBAL "[GLOBAL] ÐÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¾!\n" + MSG_KEYNOCONFIG "ÐÐµÑ [CONFIG %1].\n" + MSG_KEYUSECONFIG "ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÑÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸: %1.\n" + MSG_KEYNOSWKEY "ÐÐµÑ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Ð¿ÐµÑÐµÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð´Ð»Ñ ""%1"".\n" + MSG_KEYCANNOTDEF "ÐÐµÐ»ÑÐ·Ñ ÑÐºÐ°Ð·Ð°ÑÑ ÐºÐ»Ð°Ð²Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ â Ð¸Ð³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" + MSG_KEYDUPSWKEY "ÐÑÐ° ÐºÐ½Ð¾Ð¿ÐºÐ° ÑÐ¶Ðµ Ð½Ð°Ð·Ð½Ð°ÑÐ¸Ð½Ð°.\n" + MSG_KEYUNKNOWNMAP "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ° %1.\n" + MSG_KEYNOCHARMAPS "ÐÐµ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð° ÑÐ°Ð±Ð»Ð¸ÑÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².\n" + MSG_KEYNOKEYMAPS "ÐÐµ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð° ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ°.\n" + MSG_KEYNUMMAPS "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° %1 ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ.\n" + MSG_KEYBADMAP "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'keys display'\n" + MSG_KEYMAPSWITCHED "ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ° Ð¿ÐµÑÐµÐºÐ»ÑÑÐµÐ½Ð°.\n" +END Propchange: trunk/reactos/base/applications/network/telnet/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/telnet/telnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] Mon Jun 13 19:18:36 2016 @@ -16,7 +16,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif - +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif

8 years, 7 months

[hbelusca] 71630: [DEVMGR]: Fix resource compiler error in MSVC 2010 or GCC' windres. Detected by Victor Martinez Calvo. CORE-11408

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 13 12:54:01 2016 New Revision: 71630 URL: http://svn.reactos.org/svn/reactos?rev=71630&view=rev Log: [DEVMGR]: Fix resource compiler error in MSVC 2010 or GCC' windres. Detected by Victor Martinez Calvo. CORE-11408 Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Mon Jun 13 12:54:01 2016 @@ -305,7 +305,7 @@ IDS_HINT_UPDATE " ÐÐ°Ð¿ÑÑÐº Ð¼Ð°ÑÑÐµÑÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." IDS_HINT_UNINSTALL " Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ° Ð´Ð»Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." IDS_HINT_ADD " ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÐ°ÑÐ¾Ðµ (Ð½Ðµ Plug-and-Play) ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ð° ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." - IDS_HINT_ABOUT " Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ \"ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS\"." + IDS_HINT_ABOUT " Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ""ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS""." IDS_HINT_EXIT " ÐÑÑÐ¾Ð´ Ð¸Ð· Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ." IDS_HINT_DEV_BY_TYPE " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ ÑÐ¸Ð¿Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ."

8 years, 7 months

[dreimer] 71629: [RAPPS] Script check. Fix any broken links. Update Hashes

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jun 12 22:21:40 2016 New Revision: 71629 URL: http://svn.reactos.org/svn/reactos?rev=71629&view=rev Log: [RAPPS] Script check. Fix any broken links. Update Hashes Modified: trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/freestopwatch.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/libreofficestill.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/ultravnc.txt Modified: trunk/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=71… ============================================================================== --- trunk/reactos/media/rapps/air.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/air.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,4 +1,4 @@ -[Section] +ï»¿[Section] Name = Adobe AIR Version = 21.0 License = Adobe Software Licensing Agreement @@ -7,7 +7,6 @@ Category = 14 URLSite = https://get.adobe.com/air/ URLDownload = http://airdownload.adobe.com/air/win/download/21.0/AdobeAIRInstaller.exe -SHA1 = 27658c7839208dbb929f57a3bf416997b4e248be CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… ============================================================================== --- trunk/reactos/media/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/bittorrent.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,4 +1,4 @@ -[Section] +ï»¿[Section] Name = BitTorrent Version = 7.9.6 License = Freeware for non-commercial uses @@ -7,7 +7,6 @@ Category = 5 URLSite = http://www.bittorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/bittorrent/os/windows/track/stabl… -SHA1 = e5c3c49db7a6f41e84a3b82dd256f67950c2136b CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/freestopwatch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freestopwatch.… ============================================================================== --- trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,4 +1,4 @@ -ï»¿[Section] +[Section] Name = Free Stopwatch Version = 4.0 License = Freeware Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… ============================================================================== --- trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,13 +1,13 @@ [Section] Name = LibreOffice -Version = 5.1.2 +Version = 5.1.3 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. Size = 211.4 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = 145d2ff67904eebbaf7a119d1c43647fc9b7ad4b +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = 84b5c1274f229fdd78bab9f8bc69374c1fcb9ca6 CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… ============================================================================== --- trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,21 +1,21 @@ [Section] Name = LibreOffice Help Pack -Version = 5.1.2 +Version = 5.1.3 License = GPLv3 Description = Offline help content of LibreOffice. Size = 5.0 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = 68ac8b3f9403aead44934439426823a879530294 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = 64159f2ca666ea66c5af83be4978c39143151c0c CDPath = none [Section.0407] Name = LibreOffice Help Pack Description = Offline Hilfe fÃ¼r LibreOffice. Size = 7,1 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = be430b4249c8c126c8fe2e21e073f546ca0ed3e9 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = beaf592b811c0f67b19ddf5f1d3148cb83f0ccb7 [Section.0418] Description = ConÈinut de asistenÈÄ Èi ajutor (Ã®n limba englezÄ) pentru LibreOffice. @@ -25,21 +25,21 @@ Name = LibreOffice â Paquete de ayuda Description = PÃ¡ginas de ayuda para LibreOffice. Size = 7.0 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = 5ce1f2bc0c39c2f4f8efe30a26ec766393adfabf +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = a30459130f536a0440cfe0253c135373726aede4 [Section.041f] Name = LibreOffice YardÄ±m Paketi License = GPL sÃ¼rÃ¼m 3 Description = LibreOffice'in Ã§evrim dÄ±ÅÄ± yardÄ±m iÃ§eriÄi. -Size = 6,9 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = a7a48828286ced891e65469bedd78f43fcc396ab +Size = 7,0 MiB +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = 3b3d0ea5fa2d2daf63e9a28973931bef24787cf1 [Section.0804] Name = LibreOffice å¸®å©å Description = LibreOffice çè±æºå¸®å©åå®¹ã Size = 9.6 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.2/win/x86/Lib… -SHA1 = 6cb1fc3c2f5314f74014d903f547b1a48baf93d4 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.3/win/x86/Lib… +SHA1 = 2c83f0d3a97171e579e47a548a49642775865971 Modified: trunk/reactos/media/rapps/libreofficestill.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficesti… ============================================================================== --- trunk/reactos/media/rapps/libreofficestill.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreofficestill.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,25 +1,25 @@ [Section] Name = LibreOffice -Version = 5.0.5 +Version = 5.0.6 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 214.0 MiB +Size = 213.9 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.0.5/win/x86/Lib… -SHA1 = d0dff67cf2a4dba59a447cff25ee55e0acf1c047 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.0.6/win/x86/Lib… +SHA1 = ca6cd2a91149039b58347731313f0a29a859809b CDPath = none [Section.0407] Description = Vorher bekannt als OpenOffice. Quelloffene Office Suite. -Size = 214,0 MiB +Size = 213,9 MiB [Section.0a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. Descendiente de OpenOffice. [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 214,0 Mio +Size = 213,9 Mio [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,11 +32,11 @@ [Section.0418] Description = O suitÄ completÄ de aplicaÈii de biroticÄ, cu surse deschise. ReprezintÄ o bifurcare a dezvoltÄrii OpenOffice. -Size = 214,0 Mio +Size = 213,9 Mio [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir ofis paketi. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 214,0 MiB +Size = 213,9 MiB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/miktex.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/miktex.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,18 +1,18 @@ [Section] Name = MikTEX 2.9 -Version = 2.9.5872 +Version = 2.9.5997 License = Freeware Description = An up-to-date implementation of TeX/LaTeX and related programs for Windows. -Size = 175.8 MiB +Size = 181.3 MiB Category = 6 URLSite = http://www.miktex.org/ -URLDownload = http://ftp.gwdg.de/pub/ctan/systems/win32/miktex/setup/basic-miktex-2.9.587… -SHA1 = 3577ba0fb3ce7d38ae1e9fe184a6efafd4659855 +URLDownload = http://ftp.gwdg.de/pub/ctan/systems/win32/miktex/setup/basic-miktex-2.9.599… +SHA1 = 01a0f011ef66b90bc0be6ef08da90e3f37059ce5 CDPath = none [Section.0407] Description = Aktuelle Implementierung von TeX/LaTeX und zugehÃ¶riger Programme fÃ¼r Windows. -Size = 175,8 MiB +Size = 181,3 MiB [Section.0a] License = Gratuita @@ -21,12 +21,12 @@ [Section.0418] License = GratuitÄ Description = MikTEX este o implementare actualizatÄ de TeX/LaTeX Èi aprogramelor aferente. -Size = 175,8 Mio +Size = 181,3 Mio [Section.041f] License = Ãcretsiz Description = Windows iÃ§in, TeX'in, LaTeX'in ve iliÅkili izlencelerin bir Åimdiki uygulamasÄ±. -Size = 175,8 MiB +Size = 181,3 MiB [Section.0804] Description = TeX/LaTeX åç¸å³çç¨åºç Windows çä¸ä¸ªææ°æ§è¡æåµã Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… ============================================================================== --- trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,22 +1,22 @@ [Section] Name = NirLauncher -Version = 1.19.79 +Version = 1.19.88 License = Freeware Description = A package of more than 180 utilities for Windows. -Size = 45.1 MiB +Size = 23.1 MiB Category = 12 URLSite = http://launcher.nirsoft.net/ -URLDownload = https://www.accessibiliteprogrammes.fr/t%C3%A9l%C3%A9chargement/nirsoft_pac… -SHA1 = 42e87b3acd2bba6df06eaf31ecd413957d73848e +URLDownload = https://www.accessibiliteprogrammes.fr/t%C3%A9l%C3%A9chargement/nirsoft_pac… +SHA1 = 37e645bea1503207dbc3eda488bf5eec916f9a40 CDPath = none [Section.0407] Description = Paket von mehr als 180 Utilities fÃ¼r Windows. -Size = 45,1 MiB +Size = 23,1 MiB [Section.040c] Description = Un ensemble de plus de 180 utilitaires pour Windows. -Size = 45,1 Mio +Size = 23,1 Mio [Section.0a] Licence = Gratuita @@ -25,12 +25,12 @@ [Section.0418] Licence = GratuitÄ Description = Pachet cu peste 180 de utilitare. -Size = 45,1 Mio +Size = 23,1 Mio [Section.041f] License = Ãcretsiz Description = Windows iÃ§in 180 araÃ§tan daha Ã§oÄunun bir paketi. -Size = 45,1 MiB +Size = 23,1 MiB [Section.0804] Description = è¶è¿ 180 å®ç¨ç¨åºå¯ç¨äº Windows çä¸æ´å¥è¡å¨ã Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] Sun Jun 12 22:21:40 2016 @@ -1,13 +1,13 @@ [Section] Name = UltraVNC -Version = 1.2.1.0 +Version = 1.2.1.1 License = GPL Description = Open source VNC client/server. Size = 3.1 MiB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://www.uvnc.eu/download/1210/UltraVNC_1_2_10_X86_Setup.exe -SHA1 = ebc5d5ae35629771cd818b75b5fb2ee31028cf16 +URLDownload = http://www.uvnc.eu/download/1211/UltraVNC_1_2_11_X86_Setup.exe +SHA1 = 24c774bc3d5b16e84f4dc734dda520dd54e5b7f9 CDPath = none [Section.0407]

8 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016