Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[cgutman] 40004: - Merge aicom-network-fixes up to r39995
by cgutman＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: cgutman Date: Fri Mar 13 20:25:48 2009 New Revision: 40004 URL: http://svn.reactos.org/svn/reactos?rev=40004&view=rev Log: - Merge aicom-network-fixes up to r39995 Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Fri Mar 13 20:25:48 2009 @@ -70,22 +70,19 @@ } NTSTATUS NTAPI -AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp, BOOLEAN Local ) { +AfdGetSockName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PMDL Mdl = NULL, SysMdl = NULL; - PTDI_CONNECTION_INFORMATION ConnInfo = NULL; - PTRANSPORT_ADDRESS TransAddr = NULL; - HANDLE ProcHandle = NULL; - BOOLEAN UnlockSysMdl = FALSE; - PVOID UserSpace = NULL; - ULONG Length, InOutLength; - - AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + PMDL Mdl = NULL; if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + if( FCB->AddressFile.Object == NULL && FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } Mdl = IoAllocateMdl ( Irp->UserBuffer, @@ -103,124 +100,69 @@ } _SEH2_END; if( NT_SUCCESS(Status) ) { - if( Local ) { - if( FCB->AddressFile.Object == NULL ) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Status = TdiQueryInformation - ( FCB->Connection.Object ? - FCB->Connection.Object : FCB->AddressFile.Object, + ( FCB->Connection.Object ? FCB->Connection.Object : FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); - } else { - // what follows is fucked up shit. - // i'm not sure how to avoid it - // sorry - // -- arty - - if( FCB->Connection.Object == NULL || (FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CONNECTED) ) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - - if( NT_SUCCESS - ( Status = TdiBuildNullConnectionInfo - ( &ConnInfo, - FCB->RemoteAddress->Address[0].AddressType ) ) ) { - - Length = TaLengthOfTransportAddress - (ConnInfo->RemoteAddress); - - if (NT_SUCCESS(Status)) - Status = ObOpenObjectByPointer - (PsGetCurrentProcess(), - 0, - NULL, - PROCESS_ALL_ACCESS, - PsProcessType, - KernelMode, - &ProcHandle); - - if (NT_SUCCESS(Status)) - { - InOutLength = - PAGE_ROUND_UP(sizeof(TDI_CONNECTION_INFO)); - - Status = NtAllocateVirtualMemory - (ProcHandle, - (PVOID*)&UserSpace, - PAGE_SHIFT, - &InOutLength, - MEM_COMMIT, - PAGE_READWRITE); - } - - if (NT_SUCCESS(Status)) - { - ExFreePool(ConnInfo); - ConnInfo = (PTDI_CONNECTION_INFORMATION)UserSpace; - - SysMdl = IoAllocateMdl - ( UserSpace, Length, FALSE, FALSE, NULL ); - } - else - { - ExFreePool(ConnInfo); - ConnInfo = NULL; - } - } - - if( SysMdl ) { - _SEH2_TRY { - MmProbeAndLockPages( SysMdl, Irp->RequestorMode, IoModifyAccess ); - UnlockSysMdl = TRUE; - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - Status = _SEH2_GetExceptionCode(); - } _SEH2_END; - } else Status = STATUS_NO_MEMORY; - - if( NT_SUCCESS(Status) ) { - Status = TdiQueryInformation - ( FCB->Connection.Object, - TDI_QUERY_CONNECTION_INFO, - SysMdl ); - } - - if( NT_SUCCESS(Status) ) { - TransAddr = - (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); - - if( TransAddr ) - RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, - TaLengthOfTransportAddress - ( ConnInfo->RemoteAddress ) ); - else Status = STATUS_INSUFFICIENT_RESOURCES; - } - - if (UnlockSysMdl) - MmUnlockPages( SysMdl ); - - if( SysMdl ) IoFreeMdl( SysMdl ); - if( ConnInfo ) - NtFreeVirtualMemory - ( ProcHandle, - (PVOID)ConnInfo, - &InOutLength, - MEM_RELEASE ); - if( ProcHandle ) NtClose(ProcHandle); - if( TransAddr ) MmUnmapLockedPages( TransAddr, Mdl ); - MmUnlockPages( Mdl ); - IoFreeMdl( Mdl ); - } - } - } else { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - - AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + } + } else + Status = STATUS_INSUFFICIENT_RESOURCES; return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } + +NTSTATUS NTAPI +AfdGetPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ) { + NTSTATUS Status = STATUS_SUCCESS; + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + PMDL Mdl = NULL; + PTDI_CONNECTION_INFORMATION ConnInfo = NULL; + + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + if (FCB->RemoteAddress == NULL || FCB->Connection.Object == NULL) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); + } + + if(NT_SUCCESS(Status = TdiBuildNullConnectionInfo + (&ConnInfo, + FCB->RemoteAddress->Address[0].AddressType))) + { + Mdl = IoAllocateMdl(ConnInfo, + sizeof(TDI_CONNECTION_INFORMATION) + + TaLengthOfTransportAddress(ConnInfo->RemoteAddress), + FALSE, + FALSE, + NULL); + + if (Mdl) + { + _SEH2_TRY { + MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoModifyAccess); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + if (NT_SUCCESS(Status)) + { + Status = TdiQueryInformation(FCB->Connection.Object, + TDI_QUERY_CONNECTION_INFO, + Mdl); + + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(Irp->UserBuffer, ConnInfo->RemoteAddress, TaLengthOfTransportAddress + (ConnInfo->RemoteAddress)); + } + } + } + + ExFreePool(ConnInfo); + } + + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); +} Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Mar 13 20:25:48 2009 @@ -413,10 +413,10 @@ return AfdDisconnect( DeviceObject, Irp, IrpSp ); case IOCTL_AFD_GET_SOCK_NAME: - return AfdGetSockOrPeerName( DeviceObject, Irp, IrpSp, TRUE ); + return AfdGetSockName( DeviceObject, Irp, IrpSp ); case IOCTL_AFD_GET_PEER_NAME: - return AfdGetSockOrPeerName( DeviceObject, Irp, IrpSp, FALSE ); + return AfdGetPeerName( DeviceObject, Irp, IrpSp ); case IOCTL_AFD_GET_TDI_HANDLES: AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_TDI_HANDLES\n")); Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Fri Mar 13 20:25:48 2009 @@ -237,8 +237,12 @@ PIO_STACK_LOCATION IrpSp ); NTSTATUS NTAPI -AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp, BOOLEAN Local ); +AfdGetSockName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ); + +NTSTATUS NTAPI +AfdGetPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ); /* listen.c */ NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp, Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Mar 13 20:25:48 2009 @@ -830,6 +830,9 @@ PADAPTER Adapter = 0; NDIS_STATUS Status = NDIS_STATUS_FAILURE; BOOLEAN InterruptRegistered = FALSE; + NDIS_HANDLE ConfigurationHandle; + UINT *RegNetworkAddress = 0; + UINT RegNetworkAddressLength = 0; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -923,6 +926,25 @@ /* set up the initialization block */ MiPrepareInitializationBlock(Adapter); + + /* see if someone set a network address manually */ + NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); + if (Status == NDIS_STATUS_SUCCESS) + { + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == 6) + { + int i; + DPRINT("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5]); + + for(i = 0; i < 6; i++) + Adapter->InitializationBlockVirt->PADR[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } DPRINT("Interrupt registered successfully\n"); Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Mar 13 20:25:48 2009 @@ -713,6 +713,13 @@ *NetworkAddressLength = (UINT)((j/2)+0.5); + if (j == 0) + { + NDIS_DbgPrint(MIN_TRACE,("Empty NetworkAddress registry entry.\n")); + *Status = NDIS_STATUS_FAILURE; + return; + } + IntArray = ExAllocatePool(PagedPool, (*NetworkAddressLength)*sizeof(UINT)); if(!IntArray) {

1 0

[spetreolle] 40003: Spanish part for r39980: - use symbolic names instead of numeric values (made for English and German, other languages needs to change)
by spetreolle＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: spetreolle Date: Fri Mar 13 18:57:20 2009 New Revision: 40003 URL: http://svn.reactos.org/svn/reactos?rev=40003&view=rev Log: Spanish part for r39980: - use symbolic names instead of numeric values (made for English and German, other languages needs to change) Modified: trunk/reactos/dll/win32/user32/lang/es-ES.rc Modified: trunk/reactos/dll/win32/user32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/es-ES.rc [iso-8859-1] Fri Mar 13 18:57:20 2009 @@ -39,13 +39,13 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN - MENUITEM "&Restaurar", 61728 - MENUITEM "&Mover", 61456 - MENUITEM "Tamaño", 61440 - MENUITEM "Mi&nimizar", 61472 - MENUITEM "Ma&ximizar", 61488 + MENUITEM "&Restaurar", SC_RESTORE + MENUITEM "&Mover", SC_MOVE + MENUITEM "Tamaño", SC_SIZE + MENUITEM "Mi&nimizar", SC_MINIMIZE + MENUITEM "Ma&ximizar", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Cerrar\tAlt-F4", 61536 + MENUITEM "&Cerrar\tAlt-F4", SC_CLOSE END /////////////////////////////////////////////////////////////////////////////

1 0

[spetreolle] 40002: French part for r39980: - use symbolic names instead of numeric values (made for English and German, other languages needs to change)
by spetreolle＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: spetreolle Date: Fri Mar 13 17:47:19 2009 New Revision: 40002 URL: http://svn.reactos.org/svn/reactos?rev=40002&view=rev Log: French part for r39980: - use symbolic names instead of numeric values (made for English and German, other languages needs to change) Modified: trunk/reactos/dll/win32/user32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/user32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/fr-FR.rc [iso-8859-1] Fri Mar 13 17:47:19 2009 @@ -43,13 +43,13 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE BEGIN - MENUITEM "&Restaurer", 61728 - MENUITEM "&Déplacer", 61456 - MENUITEM "&Taille", 61440 - MENUITEM "Ré&duire", 61472 - MENUITEM "A&grandir", 61488 + MENUITEM "&Restaurer", SC_RESTORE + MENUITEM "&Déplacer", SC_MOVE + MENUITEM "&Taille", SC_SIZE + MENUITEM "Ré&duire", SC_MINIMIZE + MENUITEM "A&grandir", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Fermer\tAlt-F4", 61536 + MENUITEM "&Fermer\tAlt-F4", SC_CLOSE END /////////////////////////////////////////////////////////////////////////////

1 0

[janderwald] 40001: - Remove hack in IDmaChannel::PhysicalAddress as it will hide the bug and not prevent es1370mp from crashing - Fix a horrible where the Mdl was not created for the common buffer - Might fix other audio related crashes - Forward IRP_MN_QUERY_INTERFACE to next lower device object - Fix & enable PcForwardIrpSynchronous implementation - Add debug print to IServiceGroup when a unknown IID is requested
by janderwald＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: janderwald Date: Fri Mar 13 17:07:03 2009 New Revision: 40001 URL: http://svn.reactos.org/svn/reactos?rev=40001&view=rev Log: - Remove hack in IDmaChannel::PhysicalAddress as it will hide the bug and not prevent es1370mp from crashing - Fix a horrible where the Mdl was not created for the common buffer - Might fix other audio related crashes - Forward IRP_MN_QUERY_INTERFACE to next lower device object - Fix & enable PcForwardIrpSynchronous implementation - Add debug print to IServiceGroup when a unknown IID is requested Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Fri Mar 13 17:07:03 2009 @@ -125,7 +125,7 @@ This->BufferSize = BufferSize; This->AllocatedBufferSize = BufferSize; - DPRINT1("IDmaChannelSlave_fnAllocateBuffer Success Buffer %u Address %x %p\n", BufferSize, This->Address, PhysicalAddressConstraint); + DPRINT1("IDmaChannelSlave_fnAllocateBuffer Success Buffer %p BufferSize %u Address %x\n", This->Buffer, BufferSize, This->Address); return STATUS_SUCCESS; } @@ -227,17 +227,11 @@ IN IDmaChannelSlave * iface) { PHYSICAL_ADDRESS Address; + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_PhysicalAdress: This %p Virtuell %p Physical High %x Low %x%\n", This, This->Buffer, This->Address.HighPart, This->Address.LowPart); -#if 1 - - /// HACK - /// Prevent ES1371 driver from crashing by returning the vaddr instead of physical address - Address.QuadPart = (ULONG_PTR)This->Buffer; -#else - Address.QuadPart = This->Address.QuadPart; -#endif + Address = This->Address; return Address; } @@ -351,7 +345,7 @@ if (!This->Mdl) { - This->Mdl = IoAllocateMdl(&This->Buffer, This->MaximumBufferSize, FALSE, FALSE, NULL); + This->Mdl = IoAllocateMdl(This->Buffer, This->MaximumBufferSize, FALSE, FALSE, NULL); if (!This->Mdl) { return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Fri Mar 13 17:07:03 2009 @@ -135,12 +135,8 @@ return STATUS_SUCCESS; case IRP_MN_QUERY_INTERFACE: - DPRINT1("FIXME: IRP_MN_QUERY_INTERFACE: call next lower device object\n"); - /* FIXME - * call next lower device object */ - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; + DPRINT("IRP_MN_QUERY_INTERFACE\n"); + return PcForwardIrpSynchronous(DeviceObject, Irp); case IRP_MN_QUERY_DEVICE_RELATIONS: Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -264,6 +260,21 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +NTAPI +CompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned == TRUE) + { + KeSetEvent ((PKEVENT) Context, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + + /* * @implemented */ @@ -279,14 +290,15 @@ DPRINT1("PcForwardIrpSynchronous\n"); DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; -return STATUS_SUCCESS; + /* initialize the notification event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - /* copy the current stack location */ IoCopyCurrentIrpStackLocationToNext(Irp); DPRINT1("PcForwardIrpSynchronous %p Irp %p\n", DeviceExt->PrevDeviceObject, Irp); + + IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); /* now call the driver */ Status = IoCallDriver(DeviceExt->PrevDeviceObject, Irp); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Fri Mar 13 17:07:03 2009 @@ -35,6 +35,7 @@ IN REFIID refiid, OUT PVOID* Output) { + WCHAR Buffer[100]; IServiceGroupImpl * This = (IServiceGroupImpl*)iface; if (IsEqualGUIDAligned(refiid, &IID_IServiceGroup) || IsEqualGUIDAligned(refiid, &IID_IServiceSink) || @@ -44,6 +45,10 @@ InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } + + StringFromCLSID(refiid, Buffer); + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", Buffer); + return STATUS_UNSUCCESSFUL; }

1 0

[dchapyshev] 40000: - Sync ole32, oleaut32, olesvr32 with Wine head
by dchapyshev＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: dchapyshev Date: Fri Mar 13 16:40:31 2009 New Revision: 40000 URL: http://svn.reactos.org/svn/reactos?rev=40000&view=rev Log: - Sync ole32, oleaut32, olesvr32 with Wine head Removed: trunk/reactos/dll/win32/ole32/compobj.spec trunk/reactos/dll/win32/ole32/memlockbytes16.c trunk/reactos/dll/win32/ole32/ole2.spec trunk/reactos/dll/win32/ole32/ole2_16.c trunk/reactos/dll/win32/ole32/ole2conv.spec trunk/reactos/dll/win32/ole32/ole2nls.c trunk/reactos/dll/win32/ole32/ole2nls.spec trunk/reactos/dll/win32/ole32/ole2prox.spec trunk/reactos/dll/win32/ole32/storage.c trunk/reactos/dll/win32/ole32/storage.spec trunk/reactos/dll/win32/olesvr32/olesvr.spec Modified: trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/oleaut32/hash.c trunk/reactos/dll/win32/olesvr32/olesvr_main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Removed: trunk/reactos/dll/win32/ole32/compobj.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.sp… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Removed: trunk/reactos/dll/win32/ole32/memlockbytes16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Removed: trunk/reactos/dll/win32/ole32/ole2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.spec?… Removed: trunk/reactos/dll/win32/ole32/ole2_16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2_16.c?… Removed: trunk/reactos/dll/win32/ole32/ole2conv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2conv.s… Removed: trunk/reactos/dll/win32/ole32/ole2nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2nls.c?… Removed: trunk/reactos/dll/win32/ole32/ole2nls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2nls.sp… Removed: trunk/reactos/dll/win32/ole32/ole2prox.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2prox.s… Removed: trunk/reactos/dll/win32/ole32/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.c?… Removed: trunk/reactos/dll/win32/ole32/storage.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.sp… Modified: trunk/reactos/dll/win32/oleaut32/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/hash.c?… Removed: trunk/reactos/dll/win32/olesvr32/olesvr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr.… Modified: trunk/reactos/dll/win32/olesvr32/olesvr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/olesvr_…

1 0

[dchapyshev] 39999: - Update Ukrainian translation by Sakara Yevhen
by dchapyshev＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: dchapyshev Date: Fri Mar 13 16:40:25 2009 New Revision: 39999 URL: http://svn.reactos.org/svn/reactos?rev=39999&view=rev Log: - Update Ukrainian translation by Sakara Yevhen Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Fri Mar 13 16:40:25 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/calc/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS Calc - * TRANSLATOR: Artem Reznikov + * TRANSLATOR: Artem Reznikov & Sakara Yevhen */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -465,275 +465,275 @@ // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN - IDS_ANGLE_DEGREES "ãðàäóñ" - IDS_ANGLE_GRADIANS "ãðàä" - IDS_ANGLE_RADIANS "ðàä³àí" + IDS_ANGLE_DEGREES "Ãðàäóñ" + IDS_ANGLE_GRADIANS "Ãðàä" + IDS_ANGLE_RADIANS "Ðàä³àí" END // TYPES OF AREAS STRINGTABLE DISCARDABLE BEGIN - IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" - IDS_AREA_ACRES_FRANCE "Acres (France)" - IDS_AREA_ACRES_SCOTS "Acres (Scots)" - IDS_AREA_ACRES_US "Acres (US)" - IDS_AREA_ARES "Ares" - IDS_AREA_CHOU "Chou" - IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hectares" - IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" - IDS_AREA_MU "Mu" - IDS_AREA_PING "Ping" - IDS_AREA_PYEONG "Pyeong" - IDS_AREA_PYEONGBANGJA "Pyeongbangja" - IDS_AREA_RAI "Rai" + IDS_AREA_ACRES "Àêð" + IDS_AREA_ACRES_BRAZIL "Àêð (áðàçèëüñüêèé)" + IDS_AREA_ACRES_FRANCE "Àêð (ôðàíöóçüêèé)" + IDS_AREA_ACRES_SCOTS "Àêð (øîòëàíäñüêèé)" + IDS_AREA_ACRES_US "Àêð (ÑØÀ)" + IDS_AREA_ARES "Àð" + IDS_AREA_CHOU "×îó" + IDS_AREA_DANBO "Äàìáî" + IDS_AREA_HECTARES "Ãåêòàð" + IDS_AREA_JEONGBO "Äæåíãáî" + IDS_AREA_MORGEN_HUNGARY "Ìîðãåí (óãîðñüêèé)" + IDS_AREA_MU "Ìó" + IDS_AREA_PING "Ï³íã" + IDS_AREA_PYEONG "Ïéîí" + IDS_AREA_PYEONGBANGJA "Ïéîíáàíäæà" + IDS_AREA_RAI "Ðàé" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "êâàäðàòíèé ìåòð" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" - IDS_AREA_TAN "Tan" - IDS_AREA_TSUBO "Tsubo" + IDS_AREA_SQUARE_CENTIMETERS "Êâàäðàòíèé ñàíòèìåòð" + IDS_AREA_SQUARE_CHR "Êâàäðàòíèé ÷à" + IDS_AREA_SQUARE_FATHOMS "Êâàäðàòíèé ôàòîì" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Êâàäðàòíèé ôàòîì (óãîðñüêèé)" + IDS_AREA_SQUARE_FEET "Êâàäðàòíèé ôóò" + IDS_AREA_SQUARE_INCHES "Êâàäðàòíèé äþéì" + IDS_AREA_SQUARE_KILOMETERS "Êâàäðàòíèé ê³ëîìåòð" + IDS_AREA_SQUARE_LAR "Êâàäðàòíèé ëàð" + IDS_AREA_SQUARE_METER "Êâàäðàòíèé ìåòð" + IDS_AREA_SQUARE_MILES "Êâàäðàòíà ìèëÿ" + IDS_AREA_SQUARE_MILLIMETERS "Êâàäðàòíèé ì³ë³ìåòð" + IDS_AREA_SQUARE_SHAKU "Êâàäðàòíèé øàêó" + IDS_AREA_SQUARE_TSUEN "Êâàäðàòíèé òñóåí" + IDS_AREA_SQUARE_VA "Êâàäðàòíà âà" + IDS_AREA_SQUARE_YARD "Êâàäðàòíèé ÿðä" + IDS_AREA_TAN "Òàí" + IDS_AREA_TSUBO "Öóáî" END // TYPES OF COMSUMPTIONS STRINGTABLE DISCARDABLE BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + IDS_CONSUMPTION_KM_PER_L "Ê³ëîìåòð/ë³òð" + IDS_CONSUMPTION_L_PER_100_KM "Ë³òð³â/100 ê³ëîìåòð³â" + IDS_CONSUMPTION_MILES_GALLON_UK "Ìèëü/ãàëîí³â (áðèòàíñüêèé)" + IDS_CONSUMPTION_MILES_GALLON_US "Ìèëü/ãàëîí³â (ÑØÀ)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" - IDS_CURRENCY_CZECH_KORUNA "×åñüêà êðîíà" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Àâñòðàë³éñüêèé øèë³íã" + IDS_CURRENCY_BELGIAN_FRANC "Áåëüã³éñüêèé ôðàíê" + IDS_CURRENCY_CYPRIOT_POUND "Ê³ïð³îòñüêèé ôóíò" + IDS_CURRENCY_CZECH_KORUNA "×åøñüêà êðîíà" + IDS_CURRENCY_DEUTSCHE_MARK "Íåìåöüêà ìàðêà" + IDS_CURRENCY_DUTCH_GUILDER "Ãîëàíäñüêèé ãóëüäåí" IDS_CURRENCY_EURO "ªâðî" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_FINNISH_MARKKA "Ô³íñüêà ìàðêà" + IDS_CURRENCY_FRENCH_FRANC "Ôðàíöóçñüêèé ôðàíê" + IDS_CURRENCY_GREEK_DRACHMA "Ãðåöüêà äðàõìà" + IDS_CURRENCY_IRISH_POUND "²ðëàíäñüêèé ôóíò" + IDS_CURRENCY_ITALIAN_LIRA "²òàëüÿíñüêàÿ ë³ðà" + IDS_CURRENCY_LUXEMBOURG_FRANC "Ëþêñåìáóðãñüêèé ôðàíê" + IDS_CURRENCY_MALTESE_LIRA "Ìàëüòèéñüêàÿ ë³ðà" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Ïîðòóãàëüñüêå åñêóäî" IDS_CURRENCY_SLOVAK_KORUNA "Ñëîâàöüêà êðîíà" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_SLOVENIAN_TOLAR "Ñëîâåíñüêèé òîëàð" + IDS_CURRENCY_SPANISH_PESETA "²ñïàíñüêà ïåñåòà" END // TYPES OF ENERGIES STRINGTABLE DISCARDABLE BEGIN - IDS_ENERGY_15_C_CALORIES "êàëîð³ÿ 15-ãðàäóñíà" - IDS_ENERGY_BTUS "áðèòàíñüêà òåïëîâà îäèíèöÿ" - IDS_ENERGY_ERGS "åðã" - IDS_ENERGY_EVS "åëåêòðîíâîëüò" - IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" - IDS_ENERGY_IT_CALORIES "êàëîð³ÿ ì³æíàðîäíà" - IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" - IDS_ENERGY_JOULES "äæîóëü" - IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" - IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" - IDS_ENERGY_TH_CALORIES "êàëîð³ÿ òåðìîõ³ì³÷íà" + IDS_ENERGY_15_C_CALORIES "Êàëîð³ÿ 15-ãðàäóñíà" + IDS_ENERGY_BTUS "Áðèòàíñüêà òåïëîâà îäèíèöÿ" + IDS_ENERGY_ERGS "Åðã" + IDS_ENERGY_EVS "Åëåêòðîíâîëüò" + IDS_ENERGY_FOOT_POUNDS "Ôóòî-ôóíò" + IDS_ENERGY_IT_CALORIES "Êàëîð³ÿ ì³æíàðîäíà" + IDS_ENERGY_IT_KILOCALORIES "Ê³ëîêàëîð³ÿ ì³æíàðîäíà" + IDS_ENERGY_JOULES "Äæîóëü" + IDS_ENERGY_KILOJOULES "Ê³ëîäæîóëü" + IDS_ENERGY_KILOWATT_HOURS "Ê³ëîâàò çà ãîäèíó" + IDS_ENERGY_NUTRITION_CALORIES "Êàëîð³ÿ õàð÷îâà" + IDS_ENERGY_TH_CALORIES "Êàëîð³ÿ òåðìîõ³ì³÷íà" END // TYPES OF LENGTHS STRINGTABLE DISCARDABLE BEGIN - IDS_LENGTH_ANGSTROMS "àíãñòðåì" - IDS_LENGTH_ASTRONOMICAL_UNITS "àñòðîíîì³÷íà îäèíèöÿ" - IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" - IDS_LENGTH_CHAINS_UK "Chains (UK)" - IDS_LENGTH_CHI "Chi" - IDS_LENGTH_CHOU "Chou" - IDS_LENGTH_CHR "Chr" - IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" - IDS_LENGTH_FEET "Feet" - IDS_LENGTH_FURLONGS "Furlongs" - IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "Hands" - IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" - IDS_LENGTH_JA "Ja" - IDS_LENGTH_JEONG "Jeong" - IDS_LENGTH_KABIET "Kabiet" - IDS_LENGTH_KEN "Ken" - IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" - IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "ñâ³òëîâèé ð³ê" - IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "ìåòð" - IDS_LENGTH_MICRONS "ì³êðîìåòð" - IDS_LENGTH_MILES "ìèëÿ" - IDS_LENGTH_MILLIMETERS "ì³ë³ìåòð" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" - IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "ïàðñåê" - IDS_LENGTH_PICAS "Picas" - IDS_LENGTH_RI_JAPAN "Ri (Japan)" - IDS_LENGTH_RI_KOREA "Ri (Korea)" - IDS_LENGTH_RODS "Rods" - IDS_LENGTH_SAWK "Sawk" - IDS_LENGTH_SEN "Sen" - IDS_LENGTH_SHAKU "Shaku" - IDS_LENGTH_SPAN "Span" - IDS_LENGTH_SUN "Sun" - IDS_LENGTH_TSUEN "Tsuen" - IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yards" - IDS_LENGTH_YOTE "Yote" - IDS_LENGTH_ZHANG "Zhang" + IDS_LENGTH_ANGSTROMS "Àíãñòðåì" + IDS_LENGTH_ASTRONOMICAL_UNITS "Àñòðîíîì³÷íà îäèíèöÿ" + IDS_LENGTH_BARLEYCORNS "Áàðëåéêîðí" + IDS_LENGTH_CENTIMETERS "Ñàíòèìåòð" + IDS_LENGTH_CHAINS_UK "×åéí (áðèòàíñüêèé)" + IDS_LENGTH_CHI "×³" + IDS_LENGTH_CHOU "×îó" + IDS_LENGTH_CHR "×à" + IDS_LENGTH_CUN "Öóíü" + IDS_LENGTH_FATHOMS "Ôàòîì" + IDS_LENGTH_FATHOMS_HUNGARY "Ôàòîì (óãîðñüêèé)" + IDS_LENGTH_FEET "Ôóò" + IDS_LENGTH_FURLONGS "Ôàðëîíã" + IDS_LENGTH_GAN "Ãàíü" + IDS_LENGTH_HANDS "Äîëîíÿ" + IDS_LENGTH_HUNH "Õàíõ" + IDS_LENGTH_INCHES "Äþéì" + IDS_LENGTH_JA "ß" + IDS_LENGTH_JEONG "Äæåîíã" + IDS_LENGTH_KABIET "Êàáºò" + IDS_LENGTH_KEN "Êåí" + IDS_LENGTH_KEUB "Êåóá" + IDS_LENGTH_KILOMETERS "Ê³ëîìåòð" + IDS_LENGTH_LAR "Ëàð" + IDS_LENGTH_LIGHT_YEARS "Ñâ³òëîâèé ð³ê" + IDS_LENGTH_LINKS_UK "Ë³íê (áðèòàíñêèé)" + IDS_LENGTH_METERS "Ìåòð" + IDS_LENGTH_MICRONS "Ì³êðîìåòð" + IDS_LENGTH_MILES "Ìèëÿ" + IDS_LENGTH_MILLIMETERS "Ì³ë³ìåòð" + IDS_LENGTH_NAUTICAL_MILES "Ìîðñüêà ìèëÿ" + IDS_LENGTH_NIEU "Íüéî" + IDS_LENGTH_PARSECS "Ïàðñåê" + IDS_LENGTH_PICAS "Ï³êà" + IDS_LENGTH_RI_JAPAN "Ð³ (ÿïîíñüêà)" + IDS_LENGTH_RI_KOREA "Ð³ (êîðåéñüêàÿ)" + IDS_LENGTH_RODS "Ðîä" + IDS_LENGTH_SAWK "Ñîóê" + IDS_LENGTH_SEN "Ñåí" + IDS_LENGTH_SHAKU "Øàêó" + IDS_LENGTH_SPAN "Ñïàí" + IDS_LENGTH_SUN "Ñàí" + IDS_LENGTH_TSUEN "Òñóåí" + IDS_LENGTH_VA "Âà" + IDS_LENGTH_YARDS "ßðä" + IDS_LENGTH_YOTE "Éîóò" + IDS_LENGTH_ZHANG "×æàí" END // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_BTUS_PER_MINUTE "áðèòàíñüêà òåïëîâà îäèíèöÿ çà õâèëèíó" - IDS_POWER_FPS_PER_MINUTE "Foot-Pounds per minute" - IDS_POWER_HORSEPOWER "ê³íñüêà ñèëà" - IDS_POWER_KILOWATTS "ê³ëîâàò" - IDS_POWER_MEGAWATTS "ìåãàâàò" - IDS_POWER_WATTS "âàò" + IDS_POWER_BTUS_PER_MINUTE "Áðèòàíñüêà òåïëîâà îäèíèöÿ çà õâèëèíó" + IDS_POWER_FPS_PER_MINUTE "Ôóòî-ôóíò çà õâèëèíó" + IDS_POWER_HORSEPOWER "Ê³íñüêà ñèëà" + IDS_POWER_KILOWATTS "Ê³ëîâàò" + IDS_POWER_MEGAWATTS "Ìåãàâàò" + IDS_POWER_WATTS "Âàò" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" - IDS_PRESSURE_BARS "Bars" - IDS_PRESSURE_HECTOPASCALS "ãåêòîïàñêàëü" - IDS_PRESSURE_KILOPASCALS "ê³ëîïàñêàëü" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "ïàñêàëü" - IDS_PRESSURE_PSI "Pounds-force per square inch" + IDS_PRESSURE_ATMOSPHERES "Àòìîñôåðà (Ô³çè÷íà)" + IDS_PRESSURE_BARS "Áàð" + IDS_PRESSURE_HECTOPASCALS "Ãåêòîïàñêàëü" + IDS_PRESSURE_KILOPASCALS "Ê³ëîïàñêàëü" + IDS_PRESSURE_MM_OF_MERCURY "Ì³ë³ìåòð ðòóòíîãî ñòîâï÷èêà" + IDS_PRESSURE_PASCALS "Ïàñêàëü" + IDS_PRESSURE_PSI "Ôóíò íà êâàäðàòíèé äþéì" END // TYPES OF TEMPERATURES STRINGTABLE DISCARDABLE BEGIN - IDS_TEMPERATURE_CELSIUS "ãðàäóñ (çà øêàëîþ Öåëüñ³ÿ)" - IDS_TEMPERATURE_FAHRENHEIT "ãðàäóñ (çà øêàëîþ Ôàðåíãåéòà)" - IDS_TEMPERATURE_KELVIN "ãðàäóñ (çà øêàëîþ Êåëüâ³íà)" - IDS_TEMPERATURE_RANKINE "ãðàäóñ (çà øêàëîþ Ðàíê³íà)" + IDS_TEMPERATURE_CELSIUS "Ãðàäóñ (çà øêàëîþ Öåëüñ³ÿ)" + IDS_TEMPERATURE_FAHRENHEIT "Ãðàäóñ (çà øêàëîþ Ôàðåíãåéòà)" + IDS_TEMPERATURE_KELVIN "Ãðàäóñ (çà øêàëîþ Êåëüâ³íà)" + IDS_TEMPERATURE_RANKINE "Ãðàäóñ (çà øêàëîþ Ðàíê³íà)" END // TYPES OF TIME STRINGTABLE DISCARDABLE BEGIN - IDS_TIME_DAYS "äîáà" - IDS_TIME_HOURS "ãîäèíà" - IDS_TIME_MICROSECONDS "ì³êðîñåêóíäà" - IDS_TIME_MILLISECONDS "ì³ë³ñåêóíäà" - IDS_TIME_MINUTES "õâèëèíà" - IDS_TIME_SECONDS "ñåêóíäà" - IDS_TIME_WEEKS "òèæäåíü" - IDS_TIME_YEARS "ð³ê" + IDS_TIME_DAYS "Äîáà" + IDS_TIME_HOURS "Ãîäèíà" + IDS_TIME_MICROSECONDS "Ì³êðîñåêóíäà" + IDS_TIME_MILLISECONDS "Ì³ë³ñåêóíäà" + IDS_TIME_MINUTES "Õâèëèíà" + IDS_TIME_SECONDS "Ñåêóíäà" + IDS_TIME_WEEKS "Òèæäåíü" + IDS_TIME_YEARS "Ð³ê" END // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_CMS_SECOND "Centimeters/hour" - IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_FEET_SECOND "Feet/second" - IDS_VELOCITY_KILOMETERS_HOUR "ê³ëîìåòð çà ãîäèíó" - IDS_VELOCITY_KNOTS "Knots" - IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_CMS_SECOND "Ñàíòèìåòð çà ãîäèíó" + IDS_VELOCITY_FEET_HOUR "Ôóò çà ãîäèíó" + IDS_VELOCITY_FEET_SECOND "Ôóò çà ñåêóíäó" + IDS_VELOCITY_KILOMETERS_HOUR "Ê³ëîìåòð çà ãîäèíó" + IDS_VELOCITY_KNOTS "Âóçîë" + IDS_VELOCITY_MACH "Ìàõ" + IDS_VELOCITY_METERS_SECOND "Ìåòð çà ñåêóíäó" + IDS_VELOCITY_MILES_HOUR "Ìèëÿ çà ãîäèíó" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" - IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Bushels (UK)" - IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" - IDS_VOLUME_DOE "Doe" - IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" - IDS_VOLUME_GALLONS_UK "Gallons (UK)" - IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" - IDS_VOLUME_GOU "Gou" - IDS_VOLUME_HOP "Hop" - IDS_VOLUME_ICCE "Icce" - IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" - IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pints (UK)" - IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" - IDS_VOLUME_QUARTS_UK "Quarts (UK)" - IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" - IDS_VOLUME_SEKI "Seki" - IDS_VOLUME_SYOU "Syou" - IDS_VOLUME_TANANLOUNG "Tananloung" - IDS_VOLUME_TANG "Tang" - IDS_VOLUME_TO "To" + IDS_VOLUME_BARRELS_UK "Áàðåëü (áðèòàíñüêèé)" + IDS_VOLUME_BARRELS_OIL "Áàðåëü íàôòè" + IDS_VOLUME_BUN "Áóí" + IDS_VOLUME_BUSHELS_UK "Áóøåëü (áðèòàíñüêèé)" + IDS_VOLUME_BUSHELS_US "Áóøåëü (ÑØÀ)" + IDS_VOLUME_CUBIC_CENTIMETERS "Êóá³÷íèé ñàíòèìåòð" + IDS_VOLUME_CUBIC_FEET "Êóá³÷íèé ôóò" + IDS_VOLUME_CUBIC_INCHES "Êóá³÷íèé äþéì" + IDS_VOLUME_CUBIC_METERS "Êóá³÷íèé ìåòð" + IDS_VOLUME_CUBIC_YARDS "Êóá³÷íèé ÿðä" + IDS_VOLUME_DOE "Òî" + IDS_VOLUME_FLUID_OUNCES_UK "Ð³äêà óíö³ÿ (áðèòàíñüêà)" + IDS_VOLUME_FLUID_OUNCES_US "Ð³äêà óíö³ÿ (ÑØÀ)" + IDS_VOLUME_GALLONS_UK "Ãàëîí (áðèòàíñüêèé)" + IDS_VOLUME_GALLONS_DRY_US "Ãàëîí (äëÿ ñóõèõ ðå÷îâèí, ÑØÀ)" + IDS_VOLUME_GALLONS_LIQUID_US "Ãàëîí (äëÿ ð³äèí, ÑØÀ)" + IDS_VOLUME_GOU "Ãîó" + IDS_VOLUME_HOP "Õîï" + IDS_VOLUME_ICCE "²êêå" + IDS_VOLUME_KWIAN "Êâ³àí" + IDS_VOLUME_LITERS "Ë³òð" + IDS_VOLUME_MAL "Ìàëü" + IDS_VOLUME_MILLILITERS "Ì³ë³ë³òð" + IDS_VOLUME_PINTS_UK "Ï³íòà (áðèòàíñüêà)" + IDS_VOLUME_PINTS_DRY_US "Ï³íòà (äëÿ ñóõèõ ðå÷îâèí, ÑØÀ)" + IDS_VOLUME_PINTS_LIQUID_US "Ï³íòà (äëÿ ð³äèí, ÑØÀ)" + IDS_VOLUME_QUARTS_UK "Êâàðòà (áðèòàíñüêà)" + IDS_VOLUME_QUARTS_DRY_US "Êâàðòà (äëÿ ñóõèõ ðå÷îâèí, ÑØÀ)" + IDS_VOLUME_QUARTS_LIQUID_US "Êâàðòà (äëÿ ð³äèí, ÑØÀ)" + IDS_VOLUME_SEKI "Ñåê³" + IDS_VOLUME_SYOU "Ñüî" + IDS_VOLUME_TANANLOUNG "Òàíàíëóíã" + IDS_VOLUME_TANG "Òàíã" + IDS_VOLUME_TO "Òó" END // TYPES OF WEIGHTS STRINGTABLE DISCARDABLE BEGIN - IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" - IDS_WEIGHT_CHUNG "Chung" - IDS_WEIGHT_DON "Don" - IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" - IDS_WEIGHT_GWAN "Gwan" - IDS_WEIGHT_HARB "Harb" - IDS_WEIGHT_JIN_CHINA "Jin (China)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" - IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilograms" - IDS_WEIGHT_KIN "Kin" - IDS_WEIGHT_LIANG_CHINA "Liang (China)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" - IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "óíö³ÿ òîðãîâåëüíà" - IDS_WEIGHT_OUNCES_TROY "óíö³ÿ òðîéñüêà" - IDS_WEIGHT_POUNDS "ôóíò" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" - IDS_WEIGHT_SALOUNG "Saloung" - IDS_WEIGHT_STONES "Stones" - IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tonnes" - IDS_WEIGHT_TONS_UK "Tons (UK)" - IDS_WEIGHT_TONS_US "Tons (US)" -END + IDS_WEIGHT_BAHT "Áàò" + IDS_WEIGHT_CARATS "Êàðàò" + IDS_WEIGHT_CHUNG "×àíã" + IDS_WEIGHT_DON "Äîí" + IDS_WEIGHT_GEUN "Äæèí" + IDS_WEIGHT_GRAMS "Ãðàì" + IDS_WEIGHT_GWAN "Êâàí" + IDS_WEIGHT_HARB "Õàï" + IDS_WEIGHT_JIN_CHINA "Äæèí (êèòàéñüêèé)" + IDS_WEIGHT_JIN_TAIWAN "Äæèí (òàéâàíñüêèé)" + IDS_WEIGHT_KAN "Êàí" + IDS_WEIGHT_KILOGRAMS "Ê³ëîãðàì" + IDS_WEIGHT_KIN "Ê³í" + IDS_WEIGHT_LIANG_CHINA "Ë³àíã (êèòàéñüêèé)" + IDS_WEIGHT_LIANG_TAIWAN "Ë³àíã (òàéâàíñüêèé)" + IDS_WEIGHT_MONME "Ìîíì" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Óíö³ÿ (òîðã³âåëüíà)" + IDS_WEIGHT_OUNCES_TROY "Óíö³ÿ (òðîéñüêà)" + IDS_WEIGHT_POUNDS "Ôóíò" + IDS_WEIGHT_QUINTAL_METRIC "Êâ³íòàë (ìåòðè÷íèé)" + IDS_WEIGHT_SALOUNG "Ñàëóíã" + IDS_WEIGHT_STONES "Ñòîóí" + IDS_WEIGHT_TAMLUNG "òàìëóíã" + IDS_WEIGHT_TONNES "Òîííà" + IDS_WEIGHT_TONS_UK "Òîííà (áðèòàíñüêà)" + IDS_WEIGHT_TONS_US "Òîííà (ÑØÀ)" +END Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] Fri Mar 13 16:40:25 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/charmap/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for charmap - * TRANSLATOR: Artem Reznikov + * TRANSLATOR: Artem Reznikov & Sakara Yevhen */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -38,6 +38,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Òàáëèöÿ ñèìâîë³â - â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ; Âè ìîæåòå ðîçïîâñþäæóâàòè ¿¿ òà (àáî) çì³íþâàòè, äîòðèìóþ÷èñü óìîâè Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU, îïóáë³êîâàíî¿ Ôîíäîì â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; àáî ðåäàêö³¿ 2 Óãîäè, àáî áóäü-ÿêî¿ ðåäàêö³¿, âèïóùåíî¿ ï³çí³øå.\r\n\r\nÖÿ ïðîãðàìà ðîçïîâñþäæóºòüñÿ â íàä³¿ íà òå, ùî âîíà âèÿâèòüñÿ êîðèñíîþ, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É, âêëþ÷àþ÷è ÓßÂÍÎÞ ÃÀÐÀÍÒ²ªÞ ßÊÎÑÒ² àáî ÏÐÈÄÀÒÍÎÑÒ² äëÿ ïåâíèõ ö³ëåé. Ïîäðîáèö³ ì³ñòÿòüñÿ ó Â³äêðèò³é ë³öåíç³éí³é óãîä³ GNU.\r\n\r\nÐàçîì ç ö³ºþ ïðîãðàìîþ ïîâèíåí ïîøèðþâàòèñÿ ïðèì³ðíèê Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU. ßêùî â³í â³äñóòí³é, ïîâ³äîìòå ïðî öå â Ôîíä â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ (Free Software Foundation, Inc.), 675 Mass Ave, Cambridge, MA 02139, USA." IDS_ABOUT "&Ïðî Òàáëèöþ ñèìâîë³â..." END

1 0

[jmorlan] 39998: In a 'Bad command or filename' error, print the name of the non-existent program, so getting the error from a batch file isn't so mysterious.
by jmorlan＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: jmorlan Date: Fri Mar 13 04:26:08 2009 New Revision: 39998 URL: http://svn.reactos.org/svn/reactos?rev=39998&view=rev Log: In a 'Bad command or filename' error, print the name of the non-existent program, so getting the error from a batch file isn't so mysterious. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -453,7 +453,7 @@ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (first, szFullName)) { - error_bad_command (); + error_bad_command (first); cmd_free (first); cmd_free (rest); cmd_free (full); @@ -531,7 +531,7 @@ if (!RunFile(full)) { TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full)); - error_bad_command (); + error_bad_command (first); nErrorLevel = 1; } else Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -214,7 +214,7 @@ VOID ErrorMessage (DWORD, LPTSTR, ...); VOID error_no_pipe (VOID); -VOID error_bad_command (VOID); +VOID error_bad_command (LPTSTR); VOID error_invalid_drive (VOID); VOID error_req_param_missing (VOID); VOID error_sfile_not_found (LPTSTR); Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -118,9 +118,9 @@ } -VOID error_bad_command (VOID) +VOID error_bad_command (LPTSTR s) { - ConErrResPuts(STRING_ERROR_BADCOMMAND); + ConErrResPrintf(STRING_ERROR_BADCOMMAND, s); nErrorLevel = 9009; } Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -268,7 +268,7 @@ InputFile = _tpopen(Start + 1, _T("r")); if (!InputFile) { - error_bad_command(); + error_bad_command(Start + 1); return FALSE; } FullInput = ReadFileContents(InputFile, Buffer); Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -650,7 +650,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Benötigter Parameter fehlt\n" STRING_ERROR_INVALID_DRIVE, "Ungültige Laufwerksangaben\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Ungültiges Parameterformat - %s\n" -STRING_ERROR_BADCOMMAND, "Ungültiger Befehl oder Dateiname\n" +STRING_ERROR_BADCOMMAND, "Ungültiger Befehl oder Dateiname - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Fehler: Zu wenig Speicher verfügbar.\n" STRING_ERROR_CANNOTPIPE, "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n" STRING_ERROR_D_PAUSEMSG, "Drücken Sie eine beliebige Taste . . ." Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -664,7 +664,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Ëåßðåé áðáñáßôçôç ðáñÜìåôñïò\n" STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Ìç Ýãêõñï öïñìÜ ðáñáìÝôñïõ - %s\n" -STRING_ERROR_BADCOMMAND, "ÅóöáëìÝíç åíôïëÞ Þ üíïìá\n" +STRING_ERROR_BADCOMMAND, "ÅóöáëìÝíç åíôïëÞ Þ üíïìá - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" STRING_ERROR_CANNOTPIPE, "ÓöÜëìá! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG, "ÐáôÞóôå ïðïéïäÞðïôå ðëÞêôñï ãéá óõíÝ÷åéá . . ." Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -669,7 +669,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Bad command or filename\n" +STRING_ERROR_BADCOMMAND, "Bad command or filename - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -624,7 +624,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Prámetro requerido no encontrado\n" STRING_ERROR_INVALID_DRIVE, "Especificación de unidad errónea\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Formato de parámetro erróneo - %s\n" -STRING_ERROR_BADCOMMAND, "Comando o nombre de archivo erróneo\n" +STRING_ERROR_BADCOMMAND, "Comando o nombre de archivo erróneo - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Error fuera de memoria.\n" STRING_ERROR_CANNOTPIPE, "¡Error! ¡No se puede apilar! ¡No se puede abrir el archivo temporal!\n" STRING_ERROR_D_PAUSEMSG, "Pulsa una tecla para continuar . . ." Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -682,7 +682,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Paramètre requis manquant\n" STRING_ERROR_INVALID_DRIVE, "Lecteur spécifié introuvable\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramètre incorrect - %s\n" -STRING_ERROR_BADCOMMAND, "Commande ou nom de fichier inconnu\n" +STRING_ERROR_BADCOMMAND, "Commande ou nom de fichier inconnu - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Pas assez de mémoire.\n" STRING_ERROR_CANNOTPIPE, "Erreur ! Impossible de chaîner ! Échec à l'ouverture du fichier temporaire!\n" STRING_ERROR_D_PAUSEMSG, "Appuyez sur une touche pour continuer . . ." Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -604,7 +604,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Egy szükséges paraméter hiányzik\n" STRING_ERROR_INVALID_DRIVE, "Érvénytelen meghajtó\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Érvénytelen paraméter megadás - %s\n" -STRING_ERROR_BADCOMMAND, "Ismeretlen parancs vagy állomány név\n" +STRING_ERROR_BADCOMMAND, "Ismeretlen parancs vagy állomány név - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Nincs elég memória.\n" STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary állomány!\n" STRING_ERROR_D_PAUSEMSG, "A folytatáshoz nyomj meg egy billentyût . . ." Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -626,7 +626,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Parameter yang diperlukan kurang\n" STRING_ERROR_INVALID_DRIVE, "Spesifikasi drive tidak benar\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Format parameter tidak benar - %s\n" -STRING_ERROR_BADCOMMAND, "Perintah atau nama file salah\n" +STRING_ERROR_BADCOMMAND, "Perintah atau nama file salah - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Kesalahan kekurangan memori.\n" STRING_ERROR_CANNOTPIPE, "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n" STRING_ERROR_D_PAUSEMSG, "Tekan tombol untuk melanjutkan . . ." Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -672,7 +672,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Parametro obbligatorio mancante\n" STRING_ERROR_INVALID_DRIVE, "Disco non valido\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Formato dei parametri non valido - %s\n" -STRING_ERROR_BADCOMMAND, "Comando o nome di file errato\n" +STRING_ERROR_BADCOMMAND, "Comando o nome di file errato - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Errore di memoria esaurita.\n" STRING_ERROR_CANNOTPIPE, "Errore! Impossibile ridirigere! Impossibile aprire un file temporaneo!\n" STRING_ERROR_D_PAUSEMSG, "Premi un tasto per continuare . . ." Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -633,7 +633,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "KvÈp[^ªs«µÄ¢Ü·B\n" STRING_ERROR_INVALID_DRIVE, "³øÈhCuwèÅ·B\n" STRING_ERROR_INVALID_PARAM_FORMAT, "³øÈp[^Ì®Å·B - %s\n" -STRING_ERROR_BADCOMMAND, "R}hÜ½Ít@C¼ªÔáÁÄ¢Ü·B\n" +STRING_ERROR_BADCOMMAND, "R}hÜ½Ít@C¼ªÔáÁÄ¢Ü·B - %s\n" STRING_ERROR_OUT_OF_MEMORY, "s«G[B\n" STRING_ERROR_CANNOTPIPE, "G[! pCvÅ«Ü¹ñ! êt@CðJ¯Ü¹ñ!\n" STRING_ERROR_D_PAUSEMSG, "±s·éÉÍ½©L[ðµÄ¾³¢ . . ." Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -618,7 +618,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Obligatorisk parameter mangler\n" STRING_ERROR_INVALID_DRIVE, "Ugyldig stasjon angitt\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn\n" +STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Feil: Minne fullt.\n" STRING_ERROR_CANNOTPIPE, "Feil! Kan ikke bruke datakanal! Kan ikke åpne midlertidig fil!\n" STRING_ERROR_D_PAUSEMSG, "Trykk en tast for å fortsette . . ." Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -624,7 +624,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Brak wymaganego parametru\n" STRING_ERROR_INVALID_DRIVE, "Nieprawid³owe okrelenie napêdu\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Niew³aciwy format parametru - %s\n" -STRING_ERROR_BADCOMMAND, "Nieprawid³owa komenda lub nazwa pliku\n" +STRING_ERROR_BADCOMMAND, "Nieprawid³owa komenda lub nazwa pliku - %s\n" STRING_ERROR_OUT_OF_MEMORY, "B³¹d - brak pamiêci.\n" STRING_ERROR_CANNOTPIPE, "B³¹d potoków! Nie mo¿na otworzyæ pliku tymczasowego.\n" STRING_ERROR_D_PAUSEMSG, "Nacinij dowolny klawisz, aby kontynuowaæ . . ." Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -631,7 +631,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Îòñóòñòâóåò íåîáõîäèìûé ïàðàìåòð\n" STRING_ERROR_INVALID_DRIVE, "Îøèáî÷íîå îïðåäåëåíèå äèñêà\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Îøèáî÷íûé ôîðìàò ïàðàìåòðà - %s\n" -STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà\n" +STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Íåõâàòêà ïàìÿòè.\n" STRING_ERROR_CANNOTPIPE, "Îøèáêà! Íåâîçìîæíî èñïîëüçîâàòü pipe! Íåâîçìîæíî ñîçäàòü âðåìåííûé ôàéë!\n" STRING_ERROR_D_PAUSEMSG, "Äëÿ ïðîäîëæåíèÿ íàæìèòå ëþáóþ êëàâèøó . . ." Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -672,7 +672,7 @@ STRING_ERROR_REQ_PARAM_MISSING, "Â³äñóòí³é îáîâ'ÿçêîâèé ïàðàìåòð\n" STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Íåâ³ðíà êîìàíäà àáî ³ì'ÿ ôàéëó\n" +STRING_ERROR_BADCOMMAND, "Íåâ³ðíà êîìàíäà àáî ³ì'ÿ ôàéëó - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Íåäîñòàòíüî ïàì'ÿò³.\n" STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG, "Íàòèñí³òü áóäü-ÿêó êëàâ³øó äëÿ ïðîäîâæåííÿ . . ." Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Fri Mar 13 04:26:08 2009 @@ -214,7 +214,7 @@ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (rest, szFullName)) { - error_bad_command (); + error_bad_command(rest); cmd_free(comspec); return 1;

1 0

[mkupfer] 39997: - Add a hackfix comment for issue #4243 due to several requests.
by mkupfer＠svn.reactos.org 13 Mar '09

13 Mar '09

Author: mkupfer Date: Fri Mar 13 03:20:48 2009 New Revision: 39997 URL: http://svn.reactos.org/svn/reactos?rev=39997&view=rev Log: - Add a hackfix comment for issue #4243 due to several requests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 13 03:20:48 2009 @@ -1389,6 +1389,7 @@ } +/* FIXME: ReactOS specific hack */ BOOL UserDrawIconEx( HDC hDc,

1 0

[cfinck] 39996: Reenable the Solitaire Unicode build. Works well now :-)
by cfinck＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: cfinck Date: Fri Mar 13 02:43:26 2009 New Revision: 39996 URL: http://svn.reactos.org/svn/reactos?rev=39996&view=rev Log: Reenable the Solitaire Unicode build. Works well now :-) Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild [iso-8859-1] Fri Mar 13 02:43:26 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="yes"> <include base="sol">.</include> <include base="sol">cardlib</include> <library>advapi32</library>

1 0

[cgutman] 39995: - Add support for manually setting the adapter's network address
by cgutman＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: cgutman Date: Fri Mar 13 02:29:23 2009 New Revision: 39995 URL: http://svn.reactos.org/svn/reactos?rev=39995&view=rev Log: - Add support for manually setting the adapter's network address Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Mar 13 02:29:23 2009 @@ -830,6 +830,9 @@ PADAPTER Adapter = 0; NDIS_STATUS Status = NDIS_STATUS_FAILURE; BOOLEAN InterruptRegistered = FALSE; + NDIS_HANDLE ConfigurationHandle; + UINT *RegNetworkAddress = 0; + UINT RegNetworkAddressLength = 0; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -923,6 +926,25 @@ /* set up the initialization block */ MiPrepareInitializationBlock(Adapter); + + /* see if someone set a network address manually */ + NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); + if (Status == NDIS_STATUS_SUCCESS) + { + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == 6) + { + int i; + DPRINT("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5]); + + for(i = 0; i < 6; i++) + Adapter->InitializationBlockVirt->PADR[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } DPRINT("Interrupt registered successfully\n");

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
49
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 March 2009