Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cgutman] 52415: [AFD] - Hold on to the disconnect IRP until all pending sending IRPs are sent to the transport driver if a controlled disconnect was requested

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jun 22 00:17:19 2011 New Revision: 52415 URL: http://svn.reactos.org/svn/reactos?rev=52415&view=rev Log: [AFD] - Hold on to the disconnect IRP until all pending sending IRPs are sent to the transport driver if a controlled disconnect was requested Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h 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] Wed Jun 22 00:17:19 2011 @@ -440,6 +440,7 @@ ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV])); ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_PREACCEPT])); + ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) while (!IsListEmpty(&FCB->PendingConnections)) { @@ -531,58 +532,44 @@ return STATUS_SUCCESS; } -static NTSTATUS NTAPI -AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) { - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; +static +NTSTATUS +DoDisconnect(PAFD_FCB FCB, PIRP CurrentIrp) +{ PAFD_DISCONNECT_INFO DisReq; IO_STATUS_BLOCK Iosb; PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; - NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION CurrentIrpSp; USHORT Flags = 0; - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - - if( !(DisReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0 ); + NTSTATUS Status; + + CurrentIrpSp = IoGetCurrentIrpStackLocation(CurrentIrp); + DisReq = GetLockedData(CurrentIrp, CurrentIrpSp); if( DisReq->DisconnectType & AFD_DISCONNECT_SEND ) Flags |= TDI_DISCONNECT_RELEASE; if( DisReq->DisconnectType & AFD_DISCONNECT_RECV || DisReq->DisconnectType & AFD_DISCONNECT_ABORT ) Flags |= TDI_DISCONNECT_ABORT; - - if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) - { - if( !FCB->ConnectInfo ) - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, - Irp, 0 ); - - ASSERT(FCB->RemoteAddress); - - Status = TdiBuildNullConnectionInfo - ( &ConnectionReturnInfo, FCB->RemoteAddress->Address[0].AddressType ); - - if( !NT_SUCCESS(Status) ) - return UnlockAndMaybeComplete( FCB, Status, - Irp, 0 ); - + + Status = TdiBuildNullConnectionInfo(&ConnectionReturnInfo, + FCB->RemoteAddress->Address[0].AddressType); + if (NT_SUCCESS(Status)) + { FCB->ConnectInfo->UserData = FCB->DisconnectData; FCB->ConnectInfo->UserDataLength = FCB->DisconnectDataSize; FCB->ConnectInfo->Options = FCB->DisconnectOptions; FCB->ConnectInfo->OptionsLength = FCB->DisconnectOptionsSize; - - Status = TdiDisconnect( FCB->Connection.Object, - &DisReq->Timeout, - Flags, - &Iosb, - NULL, - NULL, - FCB->ConnectInfo, - ConnectionReturnInfo); - + + Status = TdiDisconnect(FCB->Connection.Object, + &DisReq->Timeout, + Flags, + &Iosb, + NULL, + NULL, + FCB->ConnectInfo, + ConnectionReturnInfo); + if (NT_SUCCESS(Status)) { FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, ConnectionReturnInfo->UserDataLength); if (FCB->FilledDisconnectData) @@ -591,7 +578,7 @@ ConnectionReturnInfo->UserData, FCB->FilledDisconnectData); } - + FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, ConnectionReturnInfo->OptionsLength); if (FCB->FilledDisconnectOptions) { @@ -600,15 +587,90 @@ FCB->FilledDisconnectOptions); } } - + ExFreePool( ConnectionReturnInfo ); - + if (Flags & TDI_DISCONNECT_RELEASE) FCB->PollState |= AFD_EVENT_DISCONNECT; else FCB->PollState |= AFD_EVENT_ABORT; - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; + FCB->PollStatus[FD_CLOSE_BIT] = Status; PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + + CurrentIrp->IoStatus.Status = Status; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, CurrentIrpSp); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT); + + return Status; +} + +VOID +RetryDisconnectCompletion(PAFD_FCB FCB) +{ + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) + { + PIRP CurrentIrp; + PLIST_ENTRY CurrentEntry; + + ASSERT(FCB->RemoteAddress); + + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + DoDisconnect(FCB, CurrentIrp); + } + } +} + +static NTSTATUS NTAPI +AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) { + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + PAFD_DISCONNECT_INFO DisReq; + NTSTATUS Status = STATUS_SUCCESS; + USHORT Flags = 0; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + if( !(DisReq = LockRequest( Irp, IrpSp )) ) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, + Irp, 0 ); + + if( DisReq->DisconnectType & AFD_DISCONNECT_SEND ) + Flags |= TDI_DISCONNECT_RELEASE; + if( DisReq->DisconnectType & AFD_DISCONNECT_RECV || + DisReq->DisconnectType & AFD_DISCONNECT_ABORT ) + Flags |= TDI_DISCONNECT_ABORT; + + if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) + { + if( !FCB->ConnectInfo ) + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, + Irp, 0 ); + + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (Flags & TDI_DISCONNECT_ABORT)) + { + /* Go ahead an execute the disconnect because we're ready for it */ + Status = DoDisconnect(FCB, Irp); + + /* DoDisconnect takes care of the IRP */ + SocketStateUnlock(FCB); + + return Status; + } + else + { + /* We have a graceful disconnect waiting on pending sends to complete */ + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_DISCONNECT); + } + } else { @@ -924,6 +986,10 @@ DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (IOCTL_AFD_SELECT)\n"); return; + case IOCTL_AFD_DISCONNECT: + Function = FUNCTION_DISCONNECT; + break; + default: ASSERT(FALSE); UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Wed Jun 22 00:17:19 2011 @@ -59,8 +59,11 @@ (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; + + RetryDisconnectCompletion(FCB); + + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; } if( !NT_SUCCESS(Status) ) { @@ -85,6 +88,8 @@ (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } + + RetryDisconnectCompletion(FCB); SocketStateUnlock( FCB ); @@ -164,6 +169,8 @@ &FCB->SendIrp.Iosb, SendComplete, FCB ); + + RetryDisconnectCompletion(FCB); } else { FCB->PollState |= AFD_EVENT_SEND; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; @@ -410,6 +417,8 @@ Status, TotalBytesCopied)); } + RetryDisconnectCompletion(FCB); + return UnlockAndMaybeComplete ( FCB, Status, Irp, TotalBytesCopied ); } 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] Wed Jun 22 00:17:19 2011 @@ -99,8 +99,9 @@ #define FUNCTION_SEND 2 #define FUNCTION_PREACCEPT 3 #define FUNCTION_ACCEPT 4 -#define FUNCTION_CLOSE 5 -#define MAX_FUNCTIONS 6 +#define FUNCTION_DISCONNECT 5 +#define FUNCTION_CLOSE 6 +#define MAX_FUNCTIONS 7 #define IN_FLIGHT_REQUESTS 4 @@ -309,6 +310,7 @@ VOID DestroySocket( PAFD_FCB FCB ); VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp); +VOID RetryDisconnectCompletion(PAFD_FCB FCB); /* read.c */

13 years, 6 months

[akhaldi] 52414: [CMAKE] * Handle the case where we may initially set some CMAKE_C_FLAGS and/or CMAKE_CXX_FLAGS.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 22 00:06:10 2011 New Revision: 52414 URL: http://svn.reactos.org/svn/reactos?rev=52414&view=rev Log: [CMAKE] * Handle the case where we may initially set some CMAKE_C_FLAGS and/or CMAKE_CXX_FLAGS. Modified: trunk/reactos/cmake/compilerflags.cmake Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Wed Jun 22 00:06:10 2011 @@ -4,8 +4,18 @@ foreach(flag ${ARGN}) set(flags_list "${flags_list} ${flag}") endforeach() - set(CMAKE_C_FLAGS ${flags_list}) - set(CMAKE_CXX_FLAGS ${flags_list}) + + if(CMAKE_C_FLAGS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}") + else() + set(CMAKE_C_FLAGS ${flags_list}) + endif() + + if(CMAKE_CXX_FLAGS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}") + else() + set(CMAKE_CXX_FLAGS ${flags_list}) + endif() endmacro() macro(add_linkerflag MODULE _flag)

13 years, 6 months

[ion] 52413: [NTOSKRNL]: ";" -> "," build fix.

by ion＠svn.reactos.org

Author: ion Date: Tue Jun 21 22:52:02 2011 New Revision: 52413 URL: http://svn.reactos.org/svn/reactos?rev=52413&view=rev Log: [NTOSKRNL]: ";" -> "," build fix. Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Jun 21 22:52:02 2011 @@ -728,7 +728,7 @@ NTSTATUS Status; KIRQL OldIrql; PKPRCB Prcb; - PKTHREAD Thread; NextThread; + PKTHREAD Thread, NextThread; /* NB: No instructions (other than entry code) should preceed this line */

13 years, 6 months

[ion] 52412: [NTOSKRNL]: It seems NtYieldExecution in Windows heavily biases towards avoiding a yield as much as possible, and thus attempts to locklessly check the PRCB's ready summary. Problem be...

by ion＠svn.reactos.org

Author: ion Date: Tue Jun 21 22:43:55 2011 New Revision: 52412 URL: http://svn.reactos.org/svn/reactos?rev=52412&view=rev Log: [NTOSKRNL]: It seems NtYieldExecution in Windows heavily biases towards avoiding a yield as much as possible, and thus attempts to locklessly check the PRCB's ready summary. Problem being that the old code was running a bunch of instructions before checking for this ready summary, and doing a double-fs/gs dereference to get the ready summary. Upon reading some WRK documentation, it appears Windows uses a KiGetCurrentReadySummary macro, which WinDBG analysis shows to be an inline that reads the ReadySummary straight from PrcbData with only a single segment read, and no code preceeding it. Although it's "unlikely" to ever really be a problem, it's perhaps best to replicate this behavior since there could be dependencies on it. Comments in file point to PDF with this information (hosted on Microsoft Research's website, publically accessible). [NTOSKRNL]: Also, fix locking order such that the current PRCB is only read after the IRQL is raised to SYNCH_LEVEL. I'm too tired to tell if this is a requirement, but the PDF shows it being done that way in Windows, so I've re-ordered the operations to match. Intuition would indicate that this shouldn't matter, as fs:1C shouldn't change from under us in the middle of execution, but why argue with public source code? vicmarcal said it's okay if this breaks the build (I don't have any way to build ReactOS anymore). Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Jun 21 22:43:55 2011 @@ -696,6 +696,28 @@ return OldAffinity; } +// +// This macro exists because NtYieldExecution locklessly attempts to read from +// the KPRCB's ready summary, and the usual way of going through KeGetCurrentPrcb +// would require getting fs:1C first (or gs), and then doing another dereference. +// In an attempt to minimize the amount of instructions and potential race/tear +// that could happen, Windows seems to define this as a macro that directly acceses +// the ready summary through a single fs: read by going through the KPCR's PrcbData. +// +// See http://research.microsoft.com/en-us/collaboration/global/asia-pacific/ +// programs/trk_case4_process-thread_management.pdf +// +// We need this per-arch because sometimes it's Prcb and sometimes PrcbData, and +// because on x86 it's FS, and on x64 it's GS (not sure what it is on ARM/PPC). +// +#ifdef _M_IX86 +#define KiGetCurrentReadySummary() __readfsdword(FIELD_OFFSET(KIPCR, PrcbData.ReadySummary)) +#elif _M_AMD64 +#define KiGetCurrentReadySummary() __readgsdword(FIELD_OFFSET(KIPCR, Prcb.ReadySummary)) +#else +#error Implement me! +#endif + /* * @implemented */ @@ -703,16 +725,23 @@ NTAPI NtYieldExecution(VOID) { - NTSTATUS Status = STATUS_NO_YIELD_PERFORMED; + NTSTATUS Status; KIRQL OldIrql; - PKPRCB Prcb = KeGetCurrentPrcb(); - PKTHREAD Thread = KeGetCurrentThread(), NextThread; + PKPRCB Prcb; + PKTHREAD Thread; NextThread; + + /* NB: No instructions (other than entry code) should preceed this line */ /* Fail if there's no ready summary */ - if (!Prcb->ReadySummary) return Status; - - /* Raise IRQL to synch */ + if (!KiGetCurrentReadySummary()) return STATUS_NO_YIELD_PERFORMED; + + /* Now get the current thread, set the status... */ + Status = STATUS_NO_YIELD_PERFORMED; + Thread = KeGetCurrentThread(); + + /* Raise IRQL to synch and get the KPRCB now */ OldIrql = KeRaiseIrqlToSynchLevel(); + Prcb = KeGetCurrentPrcb(); /* Now check if there's still a ready summary */ if (Prcb->ReadySummary)

13 years, 6 months

[rharabien] 52411: [SHELL32] - Fix resources for MSVC. Patch by Igor Igor Paliychuk [NTOSKRNL] - Match NT behavior in DisplayFilter

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 21 22:15:48 2011 New Revision: 52411 URL: http://svn.reactos.org/svn/reactos?rev=52411&view=rev Log: [SHELL32] - Fix resources for MSVC. Patch by Igor Igor Paliychuk [NTOSKRNL] - Match NT behavior in DisplayFilter Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/include/reactos/version.rc trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Âåðñèÿ " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Âåðñèÿ "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Òàçè âåðñèÿ íà ÐåàêòÎÑ å çàïèñàíà íà:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -113,7 +113,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Verze " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Verze "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Tato verze ReactOS je zaregistrována na:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -113,7 +113,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -127,7 +127,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "¸êäïóç " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "¸êäïóç "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "ÁõôÞ ç Ýêäïóç ôïõ ReactOS åßíáé êáôá÷ùñçìÝíç óôïí :", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -128,7 +128,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versión " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Versión "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Esta versión de ReactOS está registrada a:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -129,7 +129,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Cette version de ReactOS est enregistrée à:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -128,7 +128,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -126,7 +126,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versione " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Versione "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "o[W " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "o[W "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "±ÌReactOSÌo[WÍÌûÉo^³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versjon " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Versjon "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Denne ReactOS versjonen er registert til:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -133,7 +133,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Wersja " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Wersja "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Ta kopia ReactOS jest zarejestrowna na:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -127,7 +127,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -128,7 +128,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versão " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Versão "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Esta versão do ReactOS é registado a:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -127,7 +127,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versiune " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Versiune "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Versiune de ReactOS Ã®nregistratÄ pentru:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -126,7 +126,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "ÐÐµÑÑÐ¸Ñ " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "ÐÐµÑÑÐ¸Ñ "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "ÐÐ°Ð½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ ReactOS Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð° Ð½Ð°:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -131,7 +131,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Verzia " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Verzia "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Táto verzia systému ReactOS je registrovaná pre:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -125,7 +125,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -127,7 +127,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "ÐÐµÑÑÑÑ " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "ÐÐµÑÑÑÑ "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "Ð¦Ñ Ð²ÐµÑÑÑÑ ReactOS Ð·Ð°ÑÐµÑÑÑÑÐ¾Ð²Ð°Ð½Ð° Ð½Ð°:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -114,7 +114,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -126,7 +126,7 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "Version "KERNEL_VERSION_STR" ("KERNEL_VERSION_BUILD_STR")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 Modified: trunk/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.rc… ============================================================================== --- trunk/reactos/include/reactos/version.rc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.rc [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -20,7 +20,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team\0" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" /* Set defaults for everything, unless overridden */ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jun 21 22:15:48 2011 @@ -717,11 +717,19 @@ INIT_FUNCTION DisplayFilter(PCHAR *String) { - /* Ignore empty and "." strings */ - if(*String && strcmp(*String, ".") != 0) + /* Windows hack to skip first dots */ + static BOOLEAN DotHack = TRUE; + + /* If "." is given set *String to empty string */ + if(DotHack && strcmp(*String, ".") == 0) + *String = ""; + + if(**String) { /* Remove the filter */ InbvInstallDisplayStringFilter(NULL); + + DotHack = FALSE; /* Draw text screen */ DisplayBootBitmap(TRUE);

13 years, 6 months

[rharabien] 52410: - Fix build

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 21 21:06:18 2011 New Revision: 52410 URL: http://svn.reactos.org/svn/reactos?rev=52410&view=rev Log: - Fix build Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jun 21 21:06:18 2011 @@ -718,7 +718,7 @@ DisplayFilter(PCHAR *String) { /* Ignore empty and "." strings */ - if(*String && strcmp(String, ".") != 0) + if(*String && strcmp(*String, ".") != 0) { /* Remove the filter */ InbvInstallDisplayStringFilter(NULL);

13 years, 6 months

[rharabien] 52409: [BOOTVID] - Revert part of r52239: Fix support for \r and do not handle backspace - Simplify it a bit [NTOSKRNL] - Add backspace support to KdpScreenPrint - Do not draw boot text...

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 21 19:47:13 2011 New Revision: 52409 URL: http://svn.reactos.org/svn/reactos?rev=52409&view=rev Log: [BOOTVID] - Revert part of r52239: Fix support for \r and do not handle backspace - Simplify it a bit [NTOSKRNL] - Add backspace support to KdpScreenPrint - Do not draw boot text bitmap if InbvDisplayString is called with "" or "." (matches NT behavior) Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Tue Jun 21 19:47:13 2011 @@ -66,6 +66,7 @@ ULONG TextColor = 0xF; ULONG curr_x = 0; ULONG curr_y = 0; +BOOLEAN CarriageReturn = FALSE; ULONG_PTR VgaRegisterBase = 0; ULONG_PTR VgaBase = 0; @@ -279,14 +280,8 @@ NTAPI VgaScroll(ULONG Scroll) { - ULONG Top; - ULONG SourceOffset, DestOffset; - ULONG Offset; - ULONG i, j; - - /* Set memory positions of the scroll */ - SourceOffset = VgaBase + (ScrollRegion[1] * 80) + (ScrollRegion[0] >> 3); - DestOffset = SourceOffset + (Scroll * 80); + ULONG Top, RowSize, i; + PUCHAR OldPosition, NewPosition; /* Clear the 4 planes */ __outpw(0x3C4, 0xF02); @@ -296,56 +291,27 @@ /* Set Mode 1 */ ReadWriteMode(1); - - /* Save top and check if it's above the bottom */ - Top = ScrollRegion[1]; - if (Top > ScrollRegion[3]) return; + + RowSize = (ScrollRegion[2] - ScrollRegion[0] + 1) / 8; /* Start loop */ - do - { - /* Set number of bytes to loop and start offset */ - Offset = ScrollRegion[0] >> 3; - j = SourceOffset; - - /* Check if this is part of the scroll region */ - if (Offset <= (ScrollRegion[2] >> 3)) - { - /* Update position */ - i = DestOffset - SourceOffset; - - /* Loop the X axis */ - do - { - /* Write value in the new position so that we can do the scroll */ - WRITE_REGISTER_UCHAR(UlongToPtr(j), - READ_REGISTER_UCHAR(UlongToPtr(j + i))); - - /* Move to the next memory location to write to */ - j++; - - /* Move to the next byte in the region */ - Offset++; - - /* Make sure we don't go past the scroll region */ - } while (Offset <= (ScrollRegion[2] >> 3)); - } - - /* Move to the next line */ - SourceOffset += 80; - DestOffset += 80; - - /* Increase top */ - Top++; - - /* Make sure we don't go past the scroll region */ - } while (Top <= ScrollRegion[3]); + for(Top = ScrollRegion[1]; Top <= ScrollRegion[3]; ++Top) + { + /* Calculate the position in memory for the row */ + OldPosition = (PUCHAR)VgaBase + (Top + Scroll) * 80 + ScrollRegion[0] / 8; + NewPosition = (PUCHAR)VgaBase + Top * 80 + ScrollRegion[0] / 8; + + /* Scroll the row */ + for(i = 0; i < RowSize; ++i) + WRITE_REGISTER_UCHAR(NewPosition + i, READ_REGISTER_UCHAR(OldPosition + i)); + } } VOID NTAPI PreserveRow(IN ULONG CurrentTop, - IN ULONG TopDelta) + IN ULONG TopDelta, + IN BOOLEAN Direction) { PUCHAR Position1, Position2; ULONG Count; @@ -359,9 +325,19 @@ /* Set Mode 1 */ ReadWriteMode(1); - /* Calculate the position in memory for the row */ - Position1 = (PUCHAR)VgaBase + 0x9600; - Position2 = (PUCHAR)VgaBase + CurrentTop * 80; + /* Check which way we're preserving */ + if (Direction) + { + /* Calculate the position in memory for the row */ + Position1 = (PUCHAR)VgaBase + CurrentTop * 80; + Position2 = (PUCHAR)VgaBase + 0x9600; + } + else + { + /* Calculate the position in memory for the row */ + Position1 = (PUCHAR)VgaBase + 0x9600; + Position2 = (PUCHAR)VgaBase + CurrentTop * 80; + } /* Set the count and make sure it's above 0 */ Count = TopDelta * 80; @@ -378,33 +354,6 @@ Position1++; } while (--Count); } -} - -VOID -NTAPI -CleanCharacter(IN ULONG Left, - IN ULONG Top, - IN ULONG TopDelta) -{ - PUCHAR Position1, Position2; - ULONG i; - - /* Clear the 4 planes */ - __outpw(0x3C4, 0xF02); - - /* Set the bitmask to 0xFF for all 4 planes */ - __outpw(0x3CE, 0xFF08); - - /* Set Mode 1 */ - ReadWriteMode(1); - - /* Calculate the position in memory for the character */ - Position1 = (PUCHAR)VgaBase + 0x9600 + Left / 8; - Position2 = (PUCHAR)VgaBase + Top * 80 + Left / 8; - - /* Copy data from preserved row */ - for(i = 0; i < TopDelta; ++i) - WRITE_REGISTER_UCHAR(Position2 + i * 80, READ_REGISTER_UCHAR(Position1)); } VOID @@ -772,35 +721,34 @@ } else { - /* Preserve the current row */ - PreserveRow(curr_y, TopDelta); + /* Preserve row */ + PreserveRow(curr_y, TopDelta, FALSE); } /* Update current X */ curr_x = ScrollRegion[0]; + + /* Do not clear line if "\r\n" is given */ + CarriageReturn = FALSE; } else if (*String == '\r') { /* Update current X */ curr_x = ScrollRegion[0]; - } - else if (*String == '\b') - { - /* Update current X */ - if (curr_x > ScrollRegion[0]) - curr_x -= 8; - else - { - /* We are at line begin - move to previous row */ - curr_x = ScrollRegion[0]; - curr_y -= TopDelta; + + /* Check if we're being followed by a new line */ + CarriageReturn = TRUE; + } + else + { + /* check if we had a '\r' last time */ + if (CarriageReturn) + { + /* We did, clear the current row */ + PreserveRow(curr_y, TopDelta, TRUE); + CarriageReturn = FALSE; } - - /* Clean current character */ - CleanCharacter(curr_x, curr_y, TopDelta); - } - else - { + /* Display this character */ DisplayCharacter(*String, curr_x, curr_y, TextColor, 16); curr_x += 8; @@ -819,7 +767,7 @@ else { /* Preserve the current row */ - PreserveRow(curr_y, TopDelta); + PreserveRow(curr_y, TopDelta, FALSE); } /* Update X */ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jun 21 19:47:13 2011 @@ -717,11 +717,15 @@ INIT_FUNCTION DisplayFilter(PCHAR *String) { - /* Remove the filter */ - InbvInstallDisplayStringFilter(NULL); - - /* Draw text screen */ - DisplayBootBitmap(TRUE); + /* Ignore empty and "." strings */ + if(*String && strcmp(String, ".") != 0) + { + /* Remove the filter */ + InbvInstallDisplayStringFilter(NULL); + + /* Draw text screen */ + DisplayBootBitmap(TRUE); + } } VOID Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=524… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Tue Jun 21 19:47:13 2011 @@ -28,6 +28,10 @@ /* Current Port in use. FIXME: Do we support more then one? */ ULONG KdpPort; + +#define KdpScreenLineLenght 80 +CHAR KdpScreenLineBuffer[KdpScreenLineLenght + 1] = ""; +ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; /* DEBUG LOG FUNCTIONS *******************************************************/ @@ -316,8 +320,50 @@ KdpScreenPrint(LPSTR Message, ULONG Length) { - /* Call HAL */ - HalDisplayString(Message); + PCHAR pch = (PCHAR) Message; + + while (*pch) + { + if(*pch == '\b') + { + /* HalDisplayString does not support '\b'. Workaround it and use '\r' */ + if(KdpScreenLineLength > 0) + { + /* Remove last character from buffer */ + KdpScreenLineBuffer[--KdpScreenLineLength] = '\0'; + KdpScreenLineBufferPos = KdpScreenLineLength; + + /* Clear row and print line again */ + HalDisplayString("\r"); + HalDisplayString(KdpScreenLineBuffer); + } + } + else + { + KdpScreenLineBuffer[KdpScreenLineLength++] = *pch; + KdpScreenLineBuffer[KdpScreenLineLength] = '\0'; + } + + if(*pch == '\n' || KdpScreenLineLength == KdpScreenLineLenght) + { + /* Print buffered characters */ + if(KdpScreenLineBufferPos != KdpScreenLineLength) + HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); + + /* Clear line buffer */ + KdpScreenLineBuffer[0] = '\0'; + KdpScreenLineLength = KdpScreenLineBufferPos = 0; + } + + ++pch; + } + + /* Print buffered characters */ + if(KdpScreenLineBufferPos != KdpScreenLineLength) + { + HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); + KdpScreenLineBufferPos = KdpScreenLineLength; + } } VOID

13 years, 6 months

[akhaldi] 52408: [PSDK] * CLSID_ShellFolderViewOC is defined in shldisp.idl/h. A proper fix is due for msvc build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 21 18:42:51 2011 New Revision: 52408 URL: http://svn.reactos.org/svn/reactos?rev=52408&view=rev Log: [PSDK] * CLSID_ShellFolderViewOC is defined in shldisp.idl/h. A proper fix is due for msvc build. Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Tue Jun 21 18:42:51 2011 @@ -182,8 +182,6 @@ //DEFINE_GUID(IID_IShellMenuCallback, 0xcb728b20, 0xf786, 0x11ce, 0xb9, 0x42, 0x0, 0xa0, 0xc9, 0x03, 0x12, 0xe1); DEFINE_GUID(IID_IDeskBarClient, 0xEB0FE175, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x0, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); -DEFINE_GUID(CLSID_ShellFolderViewOC, 0x9BA05971, 0xF6A8, 0x11CF, 0xA4, 0x42, 0x0, 0xA0, 0xC9, 0x0A, 0x8F, 0x39); - #define CGID_InternetButtons CLSID_InternetButtons /* END REACTOS ONLY */

13 years, 6 months

[akhaldi] 52407: [TRANSLATIONS] Igor Paliychuk: * Convert UKRAINIAN and RUSSIAN localization files to utf-8 in the dll folder. * Add UKRAINIAN translation for msports. * Some Wine modules also were...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 21 18:30:06 2011 New Revision: 52407 URL: http://svn.reactos.org/svn/reactos?rev=52407&view=rev Log: [TRANSLATIONS] Igor Paliychuk: * Convert UKRAINIAN and RUSSIAN localization files to utf-8 in the dll folder. * Add UKRAINIAN translation for msports. * Some Wine modules also were converted (already sent upstream). Added: trunk/reactos/dll/win32/msports/lang/uk-UA.rc (with props) Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/console/lang/uk-UA.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/joy/lang/ru-RU.rc trunk/reactos/dll/cpl/joy/lang/uk-UA.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/liccpa/lang/ru-RU.rc trunk/reactos/dll/cpl/liccpa/lang/uk-UA.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/lang/ru-RU.rc trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/aclui/aclui_Ru.rc trunk/reactos/dll/win32/aclui/aclui_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/rsrc.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/lang/uk-UA.rc trunk/reactos/dll/win32/modemui/lang/ru-RU.rc trunk/reactos/dll/win32/modemui/lang/uk-UA.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/uk-UA.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/serialui/lang/ru-RU.rc trunk/reactos/dll/win32/serialui/lang/uk-UA.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32_new/lang/ru-RU.rc trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc trunk/reactos/dll/win32/shell32_new/shell32.rc trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/uk-UA.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/winmm/winmm_Uk.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… Modified: trunk/reactos/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/joy/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ru-RU.rc?… Modified: trunk/reactos/dll/cpl/joy/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/uk-UA.rc?… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=52… Modified: trunk/reactos/dll/cpl/liccpa/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/liccpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/telephon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ru-R… Modified: trunk/reactos/dll/cpl/telephon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/uk-U… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/timedate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ru-R… Modified: trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/uk-U… Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… Modified: trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… Modified: trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… Modified: trunk/reactos/dll/shellext/slayer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/r… Modified: trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/u… Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… Modified: trunk/reactos/dll/win32/aclui/aclui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Ru.r… Modified: trunk/reactos/dll/win32/aclui/aclui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Uk.r… Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.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… Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… Modified: trunk/reactos/dll/win32/kernel32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/uk… Modified: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ru-… Modified: trunk/reactos/dll/win32/modemui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/uk-… Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/uk-… Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Modified: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ru-R… Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Modified: trunk/reactos/dll/win32/serialui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ru… Modified: trunk/reactos/dll/win32/serialui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/uk… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ru… Modified: trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/uk… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Modified: trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang… Modified: trunk/reactos/dll/win32/shell32_new/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel… Modified: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-… Modified: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/uk-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/dll/win32/tapiui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/ru-R… Modified: trunk/reactos/dll/win32/tapiui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/uk-U… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… Modified: trunk/reactos/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/uk-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/winmm/winmm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_Uk.r…

13 years, 6 months

[akhaldi] 52406: [PSDK] * Add missing CLSID_ShellFolderViewOC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 21 17:56:10 2011 New Revision: 52406 URL: http://svn.reactos.org/svn/reactos?rev=52406&view=rev Log: [PSDK] * Add missing CLSID_ShellFolderViewOC. Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Tue Jun 21 17:56:10 2011 @@ -182,6 +182,8 @@ //DEFINE_GUID(IID_IShellMenuCallback, 0xcb728b20, 0xf786, 0x11ce, 0xb9, 0x42, 0x0, 0xa0, 0xc9, 0x03, 0x12, 0xe1); DEFINE_GUID(IID_IDeskBarClient, 0xEB0FE175, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x0, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); +DEFINE_GUID(CLSID_ShellFolderViewOC, 0x9BA05971, 0xF6A8, 0x11CF, 0xA4, 0x42, 0x0, 0xA0, 0xC9, 0x0A, 0x8F, 0x39); + #define CGID_InternetButtons CLSID_InternetButtons /* END REACTOS ONLY */

13 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011