ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2015
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
347 discussions
Start a n
N
ew thread
[pschweitzer] 69477: [MSFS] Addendum to r69475 By Thomas Faber
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Oct 10 08:37:36 2015 New Revision: 69477 URL:
http://svn.reactos.org/svn/reactos?rev=69477&view=rev
Log: [MSFS] Addendum to r69475 By Thomas Faber Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -4,8 +4,8 @@ finfo.c fsctrl.c msfs.c + msfssup.c rw.c - msfssup.c msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -11,7 +11,6 @@ #define __DRIVERS_FS_MS_MSFS_H #include <ntifs.h> -#include <wdm.h> #define DEFAULTAPI NTAPI Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 08:37:36 2015 @@ -123,8 +123,6 @@ } Fcb->WaitCount++; - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; IoMarkIrpPending(Irp); return STATUS_PENDING;
9 years, 2 months
1
0
0
0
[pschweitzer] 69476: [MSFS] Addendum to r69475
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Oct 10 08:31:25 2015 New Revision: 69476 URL:
http://svn.reactos.org/svn/reactos?rev=69476&view=rev
Log: [MSFS] Addendum to r69475 Added: trunk/reactos/drivers/filesystems/msfs/msfssup.c (with props) Added: trunk/reactos/drivers/filesystems/msfs/msfssup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfssup.c (added) +++ trunk/reactos/drivers/filesystems/msfs/msfssup.c [iso-8859-1] Sat Oct 10 08:31:25 2015 @@ -0,0 +1,130 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystems/msfs/msfssup.c + * PURPOSE: Mailslot filesystem + * PROGRAMMER: Nikita Pechenkin (n.pechenkin(a)mail.ru) + */ + +/* INCLUDES ******************************************************************/ +#include "msfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID NTAPI +MsfsInsertIrp(PIO_CSQ Csq, PIRP Irp) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + InsertTailList(&Fcb->PendingIrpQueue, &Irp->Tail.Overlay.ListEntry); +} + +VOID NTAPI +MsfsRemoveIrp(PIO_CSQ Csq, PIRP Irp) +{ + UNREFERENCED_PARAMETER(Csq); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); +} + +PIRP NTAPI +MsfsPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) +{ + PMSFS_FCB Fcb; + PIRP NextIrp = NULL; + PLIST_ENTRY NextEntry, ListHead; + PIO_STACK_LOCATION Stack; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + + ListHead = &Fcb->PendingIrpQueue; + + if (Irp == NULL) + { + NextEntry = ListHead->Flink; + } + else + { + NextEntry = Irp->Tail.Overlay.ListEntry.Flink; + } + + for (; NextEntry != ListHead; NextEntry = NextEntry->Flink) + { + NextIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + Stack = IoGetCurrentIrpStackLocation(NextIrp); + + if (PeekContext) + { + if (Stack->FileObject == (PFILE_OBJECT)PeekContext) + { + break; + } + } + else + { + break; + } + + NextIrp = NULL; + } + + return NextIrp; +} + +VOID NTAPI +MsfsAcquireLock(PIO_CSQ Csq, PKIRQL Irql) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + KeAcquireSpinLock(&Fcb->QueueLock, Irql); +} + + +VOID NTAPI +MsfsReleaseLock(PIO_CSQ Csq, KIRQL Irql) +{ + PMSFS_FCB Fcb; + + Fcb = CONTAINING_RECORD(Csq, MSFS_FCB, CancelSafeQueue); + KeReleaseSpinLock(&Fcb->QueueLock, Irql); +} + +VOID NTAPI +MsfsCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp) +{ + + UNREFERENCED_PARAMETER(Csq); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +VOID NTAPI +MsfsTimeout(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PMSFS_DPC_CTX Context; + PIRP Irp; + + Context = (PMSFS_DPC_CTX)DeferredContext; + + Irp = IoCsqRemoveIrp(Context->Csq, &Context->CsqContext); + if (Irp != NULL) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + ExFreePool(Context); +} + +/* EOF */ Propchange: trunk/reactos/drivers/filesystems/msfs/msfssup.c ------------------------------------------------------------------------------ svn:eol-style = native
9 years, 2 months
1
0
0
0
[pschweitzer] 69475: [MSFS] Implement asynchronous reading from mailslot. Patch by Nikita Pechenkin Adjustements, style fixing by myself. CORE-10245 #resolve #comment Modified patch committed with ...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Oct 10 08:29:05 2015 New Revision: 69475 URL:
http://svn.reactos.org/svn/reactos?rev=69475&view=rev
Log: [MSFS] Implement asynchronous reading from mailslot. Patch by Nikita Pechenkin Adjustements, style fixing by myself. CORE-10245 #resolve #comment Modified patch committed with r69475. I have tested kernel32:mailslot and your provided test, both are passing 100%. Thanks! Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -5,6 +5,7 @@ fsctrl.c msfs.c rw.c + msfssup.c msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/msfs/create.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ /* INCLUDES ******************************************************************/ @@ -183,6 +184,17 @@ InitializeListHead(&Fcb->MessageListHead); KeInitializeSpinLock(&Fcb->MessageListLock); + Fcb->WaitCount = 0; + KeInitializeSpinLock(&Fcb->QueueLock); + InitializeListHead(&Fcb->PendingIrpQueue); + IoCsqInitialize(&Fcb->CancelSafeQueue, + MsfsInsertIrp, + MsfsRemoveIrp, + MsfsPeekNextIrp, + MsfsAcquireLock, + MsfsReleaseLock, + MsfsCompleteCanceledIrp); + KeLockMutex(&DeviceExtension->FcbListLock); current_entry = DeviceExtension->FcbListHead.Flink; while (current_entry != &DeviceExtension->FcbListHead) Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,12 +4,14 @@ * FILE: drivers/filesystems/msfs/msfs.h * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ #ifndef __DRIVERS_FS_MS_MSFS_H #define __DRIVERS_FS_MS_MSFS_H #include <ntifs.h> +#include <wdm.h> #define DEFAULTAPI NTAPI @@ -35,7 +37,20 @@ ULONG MessageCount; KSPIN_LOCK MessageListLock; LIST_ENTRY MessageListHead; + IO_CSQ CancelSafeQueue; + KSPIN_LOCK QueueLock; + LIST_ENTRY PendingIrpQueue; + ULONG WaitCount; } MSFS_FCB, *PMSFS_FCB; + + +typedef struct _MSFS_DPC_CTX +{ + KTIMER Timer; + KDPC Dpc; + PIO_CSQ Csq; + IO_CSQ_IRP_CONTEXT CsqContext; +} MSFS_DPC_CTX, *PMSFS_DPC_CTX; typedef struct _MSFS_CCB @@ -89,4 +104,35 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +IO_CSQ_INSERT_IRP MsfsInsertIrp; +VOID NTAPI +MsfsInsertIrp(PIO_CSQ Csq, PIRP Irp); + +IO_CSQ_REMOVE_IRP MsfsRemoveIrp; +VOID NTAPI +MsfsRemoveIrp(PIO_CSQ Csq, PIRP Irp); + +IO_CSQ_PEEK_NEXT_IRP MsfsPeekNextIrp; +PIRP NTAPI +MsfsPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext); + +IO_CSQ_ACQUIRE_LOCK MsfsAcquireLock; +VOID NTAPI +MsfsAcquireLock(PIO_CSQ Csq, PKIRQL Irql); + +IO_CSQ_RELEASE_LOCK MsfsReleaseLock; +VOID NTAPI +MsfsReleaseLock(PIO_CSQ Csq, KIRQL Irql); + +IO_CSQ_COMPLETE_CANCELED_IRP MsfsCompleteCanceledIrp; +VOID NTAPI +MsfsCompleteCanceledIrp(PIO_CSQ pCsq, PIRP Irp); + +KDEFERRED_ROUTINE MsfsTimeout; +VOID NTAPI +MsfsTimeout(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2); + #endif /* __DRIVERS_FS_MS_MSFS_H */ Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r…
============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 08:29:05 2015 @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/msfs/rw.c * PURPOSE: Mailslot filesystem * PROGRAMMER: Eric Kohl + * Nikita Pechenkin (n.pechenkin(a)mail.ru) */ /* INCLUDES ******************************************************************/ @@ -28,8 +29,10 @@ ULONG Length; ULONG LengthRead = 0; PVOID Buffer; - NTSTATUS Status; - PLARGE_INTEGER Timeout; + LARGE_INTEGER Timeout; + PKTIMER Timer; + PMSFS_DPC_CTX Context; + PKDPC Dpc; DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -57,52 +60,74 @@ else Buffer = Irp->UserBuffer; - if (Fcb->TimeOut.QuadPart == -1LL) - Timeout = NULL; - else - Timeout = &Fcb->TimeOut; - - Status = KeWaitForSingleObject(&Fcb->MessageEvent, - UserRequest, - UserMode, - FALSE, - Timeout); - if (Status != STATUS_USER_APC) - { - if (Fcb->MessageCount > 0) + + if (Fcb->MessageCount > 0) + { + /* copy current message into buffer */ + Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, + MSFS_MESSAGE, + MessageListEntry); + + memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); + LengthRead = Message->Size; + + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); + RemoveHeadList(&Fcb->MessageListHead); + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); + + ExFreePoolWithTag(Message, 'rFsM'); + Fcb->MessageCount--; + if (Fcb->MessageCount == 0) { - /* copy current message into buffer */ - Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, - MSFS_MESSAGE, - MessageListEntry); - - memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); - LengthRead = Message->Size; - - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); - RemoveHeadList(&Fcb->MessageListHead); - KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); - - ExFreePoolWithTag(Message, 'rFsM'); - Fcb->MessageCount--; - if (Fcb->MessageCount == 0) - { - KeClearEvent(&Fcb->MessageEvent); - } + KeClearEvent(&Fcb->MessageEvent); } - else - { - /* No message found after waiting */ - Status = STATUS_IO_TIMEOUT; - } - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = LengthRead; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = LengthRead; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + } + + Timeout = Fcb->TimeOut; + if (Timeout.HighPart == 0 && Timeout.LowPart == 0) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_IO_TIMEOUT; + } + + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(MSFS_DPC_CTX), 'NFsM'); + if (Context == NULL) + { + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + IoCsqInsertIrp(&Fcb->CancelSafeQueue, Irp, &Context->CsqContext); + Timer = &Context->Timer; + Dpc = &Context->Dpc; + Context->Csq = &Fcb->CancelSafeQueue; + + /* No timer for INFINITY_WAIT */ + if (Timeout.QuadPart != -1) + { + KeInitializeTimer(Timer); + KeInitializeDpc(Dpc, MsfsTimeout, (PVOID)Context); + KeSetTimer(Timer, Timeout, Dpc); + } + + Fcb->WaitCount++; + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; + IoMarkIrpPending(Irp); + + return STATUS_PENDING; } @@ -118,6 +143,7 @@ KIRQL oldIrql; ULONG Length; PVOID Buffer; + PIRP CsqIrp; DPRINT("MsfsWrite(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -176,6 +202,14 @@ FALSE); } + if (Fcb->WaitCount > 0) + { + CsqIrp = IoCsqRemoveNextIrp(&Fcb->CancelSafeQueue, NULL); + /* FIXME: It is necessary to reset the timers. */ + MsfsRead(DeviceObject, CsqIrp); + Fcb->WaitCount--; + } + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length;
9 years, 2 months
1
0
0
0
[pschweitzer] 69474: [XDK] Properly define IO_CSQ function types CORE-10245
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Oct 10 07:55:42 2015 New Revision: 69474 URL:
http://svn.reactos.org/svn/reactos?rev=69474&view=rev
Log: [XDK] Properly define IO_CSQ function types CORE-10245 Modified: trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/include/xdk/iotypes.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=…
============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Sat Oct 10 07:55:42 2015 @@ -2577,9 +2577,10 @@ } IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; typedef VOID -(NTAPI *PIO_CSQ_INSERT_IRP)( +(NTAPI IO_CSQ_INSERT_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_INSERT_IRP *PIO_CSQ_INSERT_IRP; typedef NTSTATUS (NTAPI IO_CSQ_INSERT_IRP_EX)( @@ -2589,30 +2590,35 @@ typedef IO_CSQ_INSERT_IRP_EX *PIO_CSQ_INSERT_IRP_EX; typedef VOID -(NTAPI *PIO_CSQ_REMOVE_IRP)( +(NTAPI IO_CSQ_REMOVE_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_REMOVE_IRP *PIO_CSQ_REMOVE_IRP; typedef PIRP -(NTAPI *PIO_CSQ_PEEK_NEXT_IRP)( +(NTAPI IO_CSQ_PEEK_NEXT_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp, _In_ PVOID PeekContext); +typedef IO_CSQ_PEEK_NEXT_IRP *PIO_CSQ_PEEK_NEXT_IRP; typedef VOID -(NTAPI *PIO_CSQ_ACQUIRE_LOCK)( +(NTAPI IO_CSQ_ACQUIRE_LOCK)( _In_ struct _IO_CSQ *Csq, _Out_ PKIRQL Irql); +typedef IO_CSQ_ACQUIRE_LOCK *PIO_CSQ_ACQUIRE_LOCK; typedef VOID -(NTAPI *PIO_CSQ_RELEASE_LOCK)( +(NTAPI IO_CSQ_RELEASE_LOCK)( _In_ struct _IO_CSQ *Csq, _In_ KIRQL Irql); +typedef IO_CSQ_RELEASE_LOCK *PIO_CSQ_RELEASE_LOCK; typedef VOID -(NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP)( +(NTAPI IO_CSQ_COMPLETE_CANCELED_IRP)( _In_ struct _IO_CSQ *Csq, _In_ PIRP Irp); +typedef IO_CSQ_COMPLETE_CANCELED_IRP *PIO_CSQ_COMPLETE_CANCELED_IRP; typedef struct _IO_CSQ { ULONG Type;
9 years, 2 months
1
0
0
0
[gadamopoulos] 69473: [BROWSEUI] - Implement showing and hiding the Go button. Patch by Barrett Karish. CORE-10154
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Oct 9 13:20:45 2015 New Revision: 69473 URL:
http://svn.reactos.org/svn/reactos?rev=69473&view=rev
Log: [BROWSEUI] - Implement showing and hiding the Go button. Patch by Barrett Karish. CORE-10154 Modified: trunk/reactos/base/applications/iexplore/iexplore.inf trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/base/applications/iexplore/iexplore.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore…
============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -23,6 +23,7 @@ HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" [Settings.Reg] +HKCU,"Software\Microsoft\Internet Explorer\Main","ShowGoButton",2,"yes" #HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"
http://www.winehq.org
" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"
http://www.reactos.org
" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"
http://www.google.com
" Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address…
============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -34,8 +34,6 @@ ****Add command handler for show/hide Go button to OnWinEvent ****Add tooltip notify handler **Properly implement GetBandInfo - **Add support for showing/hiding Go button - **Fix so Go button will be shown/hidden properly on load **Add correct text to Go button **Implement TranslateAcceleratorIO Implement Exec @@ -112,6 +110,7 @@ HWND parentWindow; HWND combobox; HRESULT hResult; + IImageList *piml; if (pUnkSite == NULL) { @@ -136,10 +135,20 @@ // create combo box ex combobox = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, - 0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0); + 0, 0, 500, 250, parentWindow, (HMENU)IDM_TOOLBARS_ADDRESSBAR, _AtlBaseModule.GetModuleInstance(), 0); if (combobox == NULL) return E_FAIL; SubclassWindow(combobox); + + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); + } + else + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + } SendMessage(CBEM_SETEXTENDEDSTYLE, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT); @@ -170,47 +179,9 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - // TODO: properly initialize this from registry - fGoButtonShown = true; - + fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); if (fGoButtonShown) - { - const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; - HINSTANCE shellInstance; - - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - - fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | - CCS_NOPARENTALIGN | CCS_NORESIZE, - 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); - SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); - SendMessage(fGoButton, TB_ADDSTRINGW, - reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); - SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); - - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - if (FAILED_UNEXPECTEDLY(hr)) - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); - } - else - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); - } - } + CreateGoButton(); // take advice to watch events hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); @@ -333,6 +304,7 @@ { CComPtr<IWinEventHandler> winEventHandler; HRESULT hResult; + RECT rect; *theResult = 0; @@ -343,8 +315,13 @@ case WM_COMMAND: if (wParam == IDM_TOOLBARS_GOBUTTON) { - // toggle whether the Go button is displayed - // setting is Yes or No, stored in key "Software\Microsoft\Internet Explorer\Main" in value ShowGoButton + fGoButtonShown = !SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", REG_SZ, fGoButtonShown ? (LPVOID)L"yes" : (LPVOID)L"no", fGoButtonShown ? 8 : 6, SHREGSET_FORCE_HKCU); + if (!fGoButton) + CreateGoButton(); + ::ShowWindow(fGoButton,fGoButtonShown ? SW_HIDE : SW_SHOW); + GetWindowRect(&rect); + SendMessage(m_hWnd,WM_SIZE,0,MAKELPARAM(rect.right-rect.left,rect.bottom-rect.top)); // broadcast change notification to all explorer windows } break; @@ -600,6 +577,9 @@ newHeight = HIWORD(lParam); newWidth = LOWORD(lParam); + if (!fGoButton) + CreateGoButton(); + SendMessage(fGoButton, TB_GETITEMRECT, 0, reinterpret_cast<LPARAM>(&buttonBounds)); buttonWidth = buttonBounds.right - buttonBounds.left; buttonHeight = buttonBounds.bottom - buttonBounds.top; @@ -636,6 +616,9 @@ return 0; } + if (!fGoButton) + CreateGoButton(); + positionInfoCopy = *reinterpret_cast<WINDOWPOS *>(lParam); newHeight = positionInfoCopy.cy; newWidth = positionInfoCopy.cx; @@ -663,3 +646,32 @@ { return ShellObjectCreator<CAddressBand>(riid, ppv); } + +void CAddressBand::CreateGoButton() +{ + const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; + HIMAGELIST normalImagelist; + HIMAGELIST hotImageList; + HINSTANCE shellInstance; + + + shellInstance = GetModuleHandle(_T("shell32.dll")); + normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + + fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | + CCS_NOPARENTALIGN | CCS_NORESIZE, + 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); + if (normalImagelist) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); + if (hotImageList) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + SendMessage(fGoButton, TB_ADDSTRINGW, + reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); + SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); +} Modified: trunk/reactos/dll/win32/browseui/addressband.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address…
============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -48,6 +48,7 @@ virtual ~CAddressBand(); private: void FocusChange(BOOL bFocus); + void CreateGoButton(); public: // *** IDeskBand methods *** virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne…
============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Fri Oct 9 13:20:45 2015 @@ -1663,6 +1663,7 @@ RBHITTESTINFO hitTestInfo; REBARBANDINFOW rebarBandInfo; int bandID; + BOOL goButtonChecked; clickLocation.x = LOWORD(lParam); clickLocation.y = HIWORD(lParam); @@ -1712,6 +1713,8 @@ SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); + goButtonChecked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, goButtonChecked); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, @@ -1729,6 +1732,9 @@ break; case IDM_TOOLBARS_CUSTOMIZE: // customize SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); + break; + case IDM_TOOLBARS_GOBUTTON: + SendMessage(fNavigationWindow, WM_COMMAND, IDM_TOOLBARS_GOBUTTON, 0); break; }
9 years, 2 months
1
0
0
0
[akhaldi] 69472: [PSDK] Correct addParameter() uri default value too. CORE-10320
by akhaldi@svn.reactos.org
Author: akhaldi Date: Fri Oct 9 09:27:39 2015 New Revision: 69472 URL:
http://svn.reactos.org/svn/reactos?rev=69472&view=rev
Log: [PSDK] Correct addParameter() uri default value too. CORE-10320 Modified: trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re…
============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Fri Oct 9 09:27:39 2015 @@ -1286,7 +1286,7 @@ HRESULT addParameter( [in] BSTR p, [in] VARIANT var, - [in, defaultvalue("")] BSTR uri); + [in, defaultvalue(L"")] BSTR uri); [id(DISPID_XMLDOM_PROCESSOR_ADDOBJECT)] HRESULT addObject(
9 years, 2 months
1
0
0
0
[akhaldi] 69471: [PSDK] Correct setStartMode() uri default value. CORE-10320
by akhaldi@svn.reactos.org
Author: akhaldi Date: Fri Oct 9 09:12:57 2015 New Revision: 69471 URL:
http://svn.reactos.org/svn/reactos?rev=69471&view=rev
Log: [PSDK] Correct setStartMode() uri default value. CORE-10320 Modified: trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/include/psdk/msxml2.idl URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re…
============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Fri Oct 9 09:12:57 2015 @@ -1258,7 +1258,7 @@ [id(DISPID_XMLDOM_PROCESSOR_SETSTARTMODE)] HRESULT setStartMode( [in] BSTR p, - [in, defaultvalue("")] BSTR uri); + [in, defaultvalue(L"")] BSTR uri); [propget, id(DISPID_XMLDOM_PROCESSOR_STARTMODE)] HRESULT startMode([retval, out] BSTR *p);
9 years, 2 months
1
0
0
0
[rnaumann] 69470: [SHELL32] Update German translation
by rnaumann@svn.reactos.org
Author: rnaumann Date: Fri Oct 9 06:26:34 2015 New Revision: 69470 URL:
http://svn.reactos.org/svn/reactos?rev=69470&view=rev
Log: [SHELL32] Update German translation Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc 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] Fri Oct 9 06:26:34 2015 @@ -819,6 +819,6 @@ IDS_EXE_DESCRIPTION "Beschreibung:" IDS_MENU_EMPTY "(Leer)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" -END + IDS_OBJECTS "%d Objekte" + IDS_OBJECTS_SELECTED "%d Objekte ausgewählt" +END
9 years, 2 months
1
0
0
0
[gadamopoulos] 69469: [SHELL32] - "Fix" SHChangeNotifyRegister to report file system changes. I am not really sure if these changes are correct but really make it work now. CORE-1171
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Oct 9 00:31:47 2015 New Revision: 69469 URL:
http://svn.reactos.org/svn/reactos?rev=69469&view=rev
Log: [SHELL32] - "Fix" SHChangeNotifyRegister to report file system changes. I am not really sure if these changes are correct but really make it work now. CORE-1171 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView…
============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Oct 9 00:31:47 2015 @@ -1979,7 +1979,7 @@ TRACE("(%p)(%p,%p,0x%08x)\n", this, Pidls[0], Pidls[1], lParam); - switch (lParam) + switch (lParam &~ SHCNE_INTERRUPT) { case SHCNE_MKDIR: case SHCNE_CREATE: Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha…
============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Fri Oct 9 00:31:47 2015 @@ -378,11 +378,11 @@ } if( ( ( wEventId & SHCNE_NOITEMEVENTS ) && - ( wEventId & ~SHCNE_NOITEMEVENTS ) ) || + ( wEventId & ~(SHCNE_NOITEMEVENTS | SHCNE_INTERRUPT) ) ) || ( ( wEventId & SHCNE_ONEITEMEVENTS ) && - ( wEventId & ~SHCNE_ONEITEMEVENTS ) ) || + ( wEventId & ~(SHCNE_ONEITEMEVENTS | SHCNE_INTERRUPT) ) ) || ( ( wEventId & SHCNE_TWOITEMEVENTS ) && - ( wEventId & ~SHCNE_TWOITEMEVENTS ) ) ) + ( wEventId & ~(SHCNE_TWOITEMEVENTS | SHCNE_INTERRUPT) ) ) ) { WARN("mutually incompatible events listed\n"); return; @@ -692,12 +692,14 @@ LPNOTIFYREGISTER item = (LPNOTIFYREGISTER) lpOverlapped->hEvent; TRACE("_NotificationCompletion\n"); +#if 0 if (dwErrorCode == ERROR_OPERATION_ABORTED) { /* Command was induced by CancelIo in the shutdown procedure. */ TRACE("_NotificationCompletion ended.\n"); return; } +#endif /* This likely means overflow, so force whole directory refresh. */ if (!dwNumberOfBytesTransfered)
9 years, 2 months
1
0
0
0
[gadamopoulos] 69468: [SHELL32] - CDefView: Implement updating the status bar . Based on patch by Barrett Karish CORE-10300
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Oct 9 00:27:34 2015 New Revision: 69468 URL:
http://svn.reactos.org/svn/reactos?rev=69468&view=rev
Log: [SHELL32] - CDefView: Implement updating the status bar . Based on patch by Barrett Karish CORE-10300 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp 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/he-IL.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/sq-AL.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/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView…
============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Oct 9 00:27:34 2015 @@ -125,6 +125,7 @@ HRESULT IncludeObject(PCUITEMID_CHILD pidl); HRESULT OnDefaultCommand(); HRESULT OnStateChange(UINT uFlags); + void UpdateStatusbar(); void CheckToolbar(); void SetStyle(DWORD dwAdd, DWORD dwRemove); BOOL CreateList(); @@ -467,6 +468,26 @@ m_pShellBrowser->SendControlMsg(FCW_TOOLBAR, TB_ENABLEBUTTON, FCIDM_TB_REPORTVIEW, TRUE, &result); } +} + +void CDefView::UpdateStatusbar() +{ + WCHAR szFormat[MAX_PATH] = {0}; + WCHAR szObjects[MAX_PATH] = {0}; + UINT cSelectedItems; + + cSelectedItems = m_ListView.GetSelectedCount(); + if (cSelectedItems) + { + LoadStringW(shell32_hInstance, IDS_OBJECTS_SELECTED, szFormat, _countof(szFormat)); + StringCchPrintfW(szObjects, MAX_PATH, szFormat, cSelectedItems); + } + else + { + LoadStringW(shell32_hInstance, IDS_OBJECTS, szFormat, _countof(szFormat)); + StringCchPrintfW(szObjects, MAX_PATH, szFormat, m_ListView.GetItemCount()); + } + m_pShellBrowser->SetStatusTextSB(szObjects); } /********************************************************** @@ -1071,6 +1092,8 @@ m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW)); + UpdateStatusbar(); + return S_OK; } @@ -1822,6 +1845,7 @@ case LVN_ITEMCHANGED: TRACE("-- LVN_ITEMCHANGED %p\n", this); OnStateChange(CDBOSC_SELCHANGE); /* the browser will get the IDataObject now */ + UpdateStatusbar(); break; case LVN_BEGINDRAG: 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -824,4 +824,6 @@ IDS_EXE_DESCRIPTION "Popis:" IDS_MENU_EMPTY "(Prázdné)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -824,4 +824,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -819,4 +819,6 @@ IDS_EXE_DESCRIPTION "Beschreibung:" IDS_MENU_EMPTY "(Leer)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -819,4 +819,6 @@ IDS_EXE_DESCRIPTION "Descripción:" IDS_MENU_EMPTY "(VacÃo)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description :" IDS_MENU_EMPTY "(Vide)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-…
============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Descrizione:" IDS_MENU_EMPTY "(Vuoto)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -822,4 +822,6 @@ IDS_EXE_DESCRIPTION "Opis:" IDS_MENU_EMPTY "(Puste)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Descrição:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -820,4 +820,6 @@ IDS_EXE_DESCRIPTION "Descriere:" IDS_MENU_EMPTY "(Gol)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -820,4 +820,6 @@ IDS_EXE_DESCRIPTION "ÐпиÑание:" IDS_MENU_EMPTY "(пÑÑÑо)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-…
============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Fri Oct 9 00:27:34 2015 @@ -822,4 +822,6 @@ IDS_EXE_DESCRIPTION "Përshkrimi:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Açıklama:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -818,4 +818,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -825,4 +825,6 @@ IDS_EXE_DESCRIPTION "æè¿°ï¼" IDS_MENU_EMPTY "(空)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END 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] Fri Oct 9 00:27:34 2015 @@ -826,4 +826,6 @@ IDS_EXE_DESCRIPTION "Description:" IDS_MENU_EMPTY "(Empty)" -END + IDS_OBJECTS "%d Objects" + IDS_OBJECTS_SELECTED "%d Objects Selected" +END Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…
============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Oct 9 00:27:34 2015 @@ -225,6 +225,8 @@ #define IDS_MYCOMPUTER 9216 #define IDS_PERSONAL 9227 #define IDS_NETWORKPLACE 9217 +#define IDS_OBJECTS 6466 +#define IDS_OBJECTS_SELECTED 6477 /* Dialogs */
9 years, 2 months
1
0
0
0
← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Results per page:
10
25
50
100
200