Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 36713: - ProbeForRead/Write Length argument is a SIZE_T, not a ULONG
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:42:44 2008 New Revision: 36713 URL: http://svn.reactos.org/svn/reactos?rev=36713&view=rev Log: - ProbeForRead/Write Length argument is a SIZE_T, not a ULONG Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ex/exintrin.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Oct 11 04:42:44 2008 @@ -7655,7 +7655,7 @@ NTAPI ProbeForRead( IN CONST VOID *Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment); NTKERNELAPI @@ -7663,7 +7663,7 @@ NTAPI ProbeForWrite( IN PVOID Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment); Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Sat Oct 11 04:42:44 2008 @@ -100,7 +100,7 @@ VOID NTAPI ProbeForRead(IN CONST VOID *Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment) { PAGED_CODE(); @@ -136,7 +136,7 @@ VOID NTAPI ProbeForWrite(IN PVOID Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment) { ULONG_PTR Last, Current = (ULONG_PTR)Address;

1 0

[sginsberg] 36712: - Fix portable Ex/ExfInterlockedCompareExchange64 to compare Destination with the Comparand instead of...itself?
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:39:08 2008 New Revision: 36712 URL: http://svn.reactos.org/svn/reactos?rev=36712&view=rev Log: - Fix portable Ex/ExfInterlockedCompareExchange64 to compare Destination with the Comparand instead of...itself? Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sat Oct 11 04:39:08 2008 @@ -105,12 +105,12 @@ FASTCALL ExfInterlockedCompareExchange64(IN OUT LONGLONG volatile *Destination, IN PLONGLONG Exchange, - IN PLONGLONG Comperand) + IN PLONGLONG Comparand) { LONGLONG Result; Result = *Destination; - if (*Destination == Result) *Destination = *Exchange; + if (*Destination == *Comparand) *Destination = *Exchange; return Result; } @@ -306,7 +306,7 @@ KeAcquireSpinLock(Lock, &OldIrql); Result = *Destination; - if (*Destination == Result) *Destination = *Exchange; + if (*Destination == *Comparand) *Destination = *Exchange; KeReleaseSpinLock(Lock, OldIrql); return Result; }

1 0

[sginsberg] 36711: - ARM build fix -- add a non-atomic (but otherwise correct) _InterlockedCompareExchange64 intrinsic required since the RTL changes in 36166
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:32:57 2008 New Revision: 36711 URL: http://svn.reactos.org/svn/reactos?rev=36711&view=rev Log: - ARM build fix -- add a non-atomic (but otherwise correct) _InterlockedCompareExchange64 intrinsic required since the RTL changes in 36166 Modified: trunk/reactos/include/psdk/intrin_arm.h Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] Sat Oct 11 04:32:57 2008 @@ -54,6 +54,17 @@ return a; } +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const dest, const long long exch, const long long comp) +{ + // + // FIXME + // + long long result; + result = *dest; + if (*dest == comp) *dest = exch; + return result; +} + static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { return (void*)_InterlockedCompareExchange((volatile long* const)Destination, (const long)Exchange, (const long)Comperand);

1 0

[tkreuzer] 36710: Sorry forgot this one. Fix build.
by tkreuzer＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: tkreuzer Date: Fri Oct 10 18:35:34 2008 New Revision: 36710 URL: http://svn.reactos.org/svn/reactos?rev=36710&view=rev Log: Sorry forgot this one. Fix build. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Fri Oct 10 18:35:34 2008 @@ -43,12 +43,6 @@ } - -PULONG_PTR -MmGetPageDirectory(VOID) -{ - return (PULONG_PTR)__readcr3(); -} static ULONG ProtectToPTE(ULONG flProtect)

1 0

[pschweitzer] 36709: Fixed a FIXME A bit cleaned header
by pschweitzer＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: pschweitzer Date: Fri Oct 10 14:26:42 2008 New Revision: 36709 URL: http://svn.reactos.org/svn/reactos?rev=36709&view=rev Log: Fixed a FIXME A bit cleaned header Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Fri Oct 10 14:26:42 2008 @@ -443,6 +443,10 @@ } +_SEH_FINALLYFUNC(VfatGetEaInformationFinal_PSEH) +{ +} + static NTSTATUS VfatGetEaInformation(PFILE_OBJECT FileObject, PVFATFCB Fcb, @@ -452,15 +456,19 @@ { PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; - /* FIXME - use SEH to access the buffer! */ - Info->EaSize = 0; - *BufferLength -= sizeof(*Info); - if (DeviceExt->FatInfo.FatType == FAT12 || - DeviceExt->FatInfo.FatType == FAT16) - { - /* FIXME */ - DPRINT1("VFAT: FileEaInformation not implemented!\n"); - } + _SEH_TRY + { + RtlZeroMemory(Info, sizeof(FILE_EA_INFORMATION)); + if (DeviceExt->FatInfo.FatType == FAT12 || + DeviceExt->FatInfo.FatType == FAT16) + { + /* FIXME */ + DPRINT1("VFAT: FileEaInformation not implemented!\n"); + } + *BufferLength -= sizeof(FILE_EA_INFORMATION); + } + _SEH_FINALLY(VfatGetEaInformationFinal_PSEH) + _SEH_END; return STATUS_SUCCESS; } Modified: branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Fri Oct 10 14:26:42 2008 @@ -608,15 +608,7 @@ /* -------------------------------------------------------- string.c */ -VOID -vfatSplitPathName(PUNICODE_STRING PathNameU, - PUNICODE_STRING DirNameU, - PUNICODE_STRING FileNameU); - BOOLEAN vfatIsLongIllegal(WCHAR c); - -BOOLEAN wstrcmpjoki (PWSTR s1, - PWSTR s2); /* ----------------------------------------------------------- fat.c */ @@ -702,6 +694,11 @@ /* ----------------------------------------------------------- fcb.c */ +VOID +vfatSplitPathName(PUNICODE_STRING PathNameU, + PUNICODE_STRING DirNameU, + PUNICODE_STRING FileNameU); + PVFATFCB vfatNewFCB (PDEVICE_EXTENSION pVCB, PUNICODE_STRING pFileNameU);

1 0

[pschweitzer] 36708: Added missing define
by pschweitzer＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: pschweitzer Date: Fri Oct 10 12:44:00 2008 New Revision: 36708 URL: http://svn.reactos.org/svn/reactos?rev=36708&view=rev Log: Added missing define Modified: branches/pierre-fsd/include/ddk/ntifs.h Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Fri Oct 10 12:44:00 2008 @@ -4486,6 +4486,13 @@ NTSYSAPI VOID NTAPI +RtlFreeOemString ( + IN POEM_STRING OemString +); + +NTSYSAPI +VOID +NTAPI RtlGenerate8dot3Name ( IN PUNICODE_STRING Name, IN BOOLEAN AllowExtendedCharacters,

1 0

[cfinck] 36707: Fix the units
by cfinck＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: cfinck Date: Fri Oct 10 11:42:09 2008 New Revision: 36707 URL: http://svn.reactos.org/svn/reactos?rev=36707&view=rev Log: Fix the units Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/lang/da-DK.rc trunk/reactos/dll/win32/netshell/lang/el-GR.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/hu-HU.rc trunk/reactos/dll/win32/netshell/lang/id-ID.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/nl-NL.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/sv-SE.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -94,10 +94,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -88,10 +88,10 @@ IDS_NET_DELETE "Borrar" IDS_NET_PROPERTIES "Propiedades" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -93,10 +93,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -98,10 +98,10 @@ IDS_NET_DELETE "Cancella" IDS_NET_PROPERTIES "Proprietà" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -97,10 +97,10 @@ IDS_NET_DELETE "Slett" IDS_NET_PROPERTIES "Egenskaper" - IDS_FORMAT_BIT "%u Byte/s" - IDS_FORMAT_KBIT "%u KB/s" - IDS_FORMAT_MBIT "%u MB/s" - IDS_FORMAT_GBIT "%u GB/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d dag %s" IDS_DURATION_DAYS "%d dager %s" END Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -93,10 +93,10 @@ IDS_NET_DELETE "Usuñ" IDS_NET_PROPERTIES "W³aciwoci" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -93,10 +93,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -95,10 +95,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Fri Oct 10 11:42:09 2008 @@ -92,10 +92,10 @@ IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bytes/s" - IDS_FORMAT_KBIT "%u KBytes/s" - IDS_FORMAT_MBIT "%u MBytes/s" - IDS_FORMAT_GBIT "%u GBytes/s" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" IDS_DURATION_DAY "%d Day %s" IDS_DURATION_DAYS "%d Days %s" END

1 0

[janderwald] 36706: - Implement IContextMenu3, IObjectWithSite, IExtractIconW interface
by janderwald＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: janderwald Date: Fri Oct 10 10:18:18 2008 New Revision: 36706 URL: http://svn.reactos.org/svn/reactos?rev=36706&view=rev Log: - Implement IContextMenu3, IObjectWithSite, IExtractIconW interface Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Fri Oct 10 10:18:18 2008 @@ -31,16 +31,27 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; LONG ref; - const IContextMenu2Vtbl *lpVtblContextMenu; + const IPersistFolder2Vtbl *lpVtblPersistFolder2; - const IQueryInfoVtbl *lpVtblQueryInfo; + //const IPersistIDListVtbl *lpVtblPersistIDList; /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ - LPCITEMIDLIST apidl; /* currently focused font item */ + LPITEMIDLIST pidl; /* enumerated pidl */ IOleCommandTarget * lpOleCmd; } IGenericSFImpl, *LPIGenericSFImpl; +typedef struct +{ + const IContextMenu3Vtbl *lpVtblContextMenu; + const IObjectWithSiteVtbl *lpVtblObjectWithSite; + const IQueryInfoVtbl *lpVtblQueryInfo; + const IExtractIconWVtbl *lpVtblExtractIconW; + LONG ref; + LPCITEMIDLIST apidl; + IUnknown *pUnknown; + IOleCommandTarget * lpOleCmd; +}IContextMenuImpl, *LPIContextMenuImpl; static const shvheader NetConnectSFHeader[] = { {IDS_SHV_COLUMN_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, @@ -60,9 +71,20 @@ #define COLUMN_PHONE 4 #define COLUMN_OWNER 5 -static LPIGenericSFImpl __inline impl_from_IContextMenu2(IContextMenu2 *iface) -{ - return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblContextMenu)); +static const IContextMenu3Vtbl vt_ContextMenu3; +static const IObjectWithSiteVtbl vt_ObjectWithSite; +static const IQueryInfoVtbl vt_QueryInfo; +static const IExtractIconWVtbl vt_ExtractIconW; + +static LPIContextMenuImpl __inline impl_from_IExtractIcon(IExtractIconW *iface) +{ + return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblExtractIconW)); +} + + +static LPIContextMenuImpl __inline impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblObjectWithSite)); } static LPIGenericSFImpl __inline impl_from_IPersistFolder2(IPersistFolder2 *iface) @@ -70,9 +92,9 @@ return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); } -static LPIGenericSFImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) -{ - return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblQueryInfo)); +static LPIContextMenuImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) +{ + return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblQueryInfo)); } @@ -99,6 +121,12 @@ { *ppvObj = (LPVOID *)&This->lpVtblPersistFolder2; } +#if 0 + else if (IsEqualIID(riid, &IID_IPersistIDList)) + { + //*ppvObj = (LPVOID *)&This->lpVtblPersistIDList; + } +#endif if (*ppvObj) { IUnknown_AddRef ((IUnknown *) (*ppvObj)); @@ -336,6 +364,38 @@ * ppvObject [out] Resulting Interface * */ +static HRESULT IContextMenuImpl_Constructor(REFIID riid, LPCITEMIDLIST apidl, LPVOID * ppvOut, IOleCommandTarget * lpOleCmd) +{ + IUnknown *pObj = NULL; + IContextMenuImpl * pMenu = CoTaskMemAlloc(sizeof(IContextMenuImpl)); + if (!pMenu) + return E_OUTOFMEMORY; + + ZeroMemory(pMenu, sizeof(IContextMenuImpl)); + + pMenu->apidl = apidl; + pMenu->lpVtblContextMenu = &vt_ContextMenu3; + pMenu->lpVtblObjectWithSite = &vt_ObjectWithSite; + pMenu->lpVtblExtractIconW = &vt_ExtractIconW; + pMenu->lpVtblQueryInfo = &vt_QueryInfo; + pMenu->pUnknown = NULL; + pMenu->lpOleCmd = lpOleCmd; + pMenu->ref = 1; + + if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2))// || IsEqualIID(riid, &IID_IContextMenu3)) + pObj = (IUnknown*)(&pMenu->lpVtblContextMenu); + else if(IsEqualIID(riid, &IID_IQueryInfo)) + pObj = (IUnknown*)(&pMenu->lpVtblQueryInfo); + else if(IsEqualIID(riid, &IID_IExtractIconW)) + pObj = (IUnknown*)(&pMenu->lpVtblExtractIconW); + + IUnknown_AddRef(pObj); + + + *ppvOut = pObj; + return S_OK; +} + static HRESULT WINAPI ISF_NetConnect_fnGetUIObjectOf (IShellFolder2 * iface, HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) @@ -350,20 +410,11 @@ *ppvOut = NULL; - if ((IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID (riid, &IID_IContextMenu2)) && (cidl >= 1)) - { - pObj = (IUnknown*)(&This->lpVtblContextMenu); - This->apidl = apidl[0]; - IUnknown_AddRef(pObj); - hr = S_OK; - } - else if (IsEqualIID(riid, &IID_IQueryInfo) && (cidl >= 1)) - { - pObj = (IUnknown*)(&This->lpVtblQueryInfo); - This->apidl = apidl[0]; - IUnknown_AddRef(pObj); - hr = S_OK; - } + if ((IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID (riid, &IID_IContextMenu2) || IsEqualIID(riid, &IID_IContextMenu3) || + IsEqualIID(riid, &IID_IQueryInfo) || IsEqualIID(riid, &IID_IExtractIconW)) && (cidl >= 1)) + { + return IContextMenuImpl_Constructor(riid, apidl[0], ppvOut, This->lpOleCmd); + } else hr = E_NOINTERFACE; @@ -623,6 +674,8 @@ ISF_NetConnect_fnGetDetailsOf, ISF_NetConnect_fnMapColumnToSCID }; +//IObjectWithSite +//IInternetSecurityManager /************************************************************************** * IContextMenu2 Implementation @@ -631,37 +684,62 @@ /************************************************************************ * ISF_NetConnect_IContextMenu_QueryInterface */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - if (IsEqualIID(iid, &IID_IContextMenu) || IsEqualIID(iid, &IID_IContextMenu2)) +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_QueryInterface(IContextMenu3 * iface, REFIID iid, LPVOID * ppvObject) +{ + //LPOLESTR pStr; + IContextMenuImpl * This = (IContextMenuImpl*)iface; + + if (IsEqualIID(iid, &IID_IContextMenu) || IsEqualIID(iid, &IID_IContextMenu2) || IsEqualIID(iid, &IID_IContextMenu3)) { *ppvObject = (IUnknown*) &This->lpVtblContextMenu; + InterlockedIncrement(&This->ref); return S_OK; } - + else if (IsEqualIID(iid, &IID_IObjectWithSite)) + { + *ppvObject = (IUnknown*) &This->lpVtblObjectWithSite; + InterlockedIncrement(&This->ref); + return S_OK; + } + else if (IsEqualIID(iid, &IID_IQueryInfo)) + { + *ppvObject = (IUnknown*) &This->lpVtblQueryInfo; + InterlockedIncrement(&This->ref); + return S_OK; + } + + //StringFromCLSID(iid, &pStr); + //MessageBoxW(NULL, L"ISF_NetConnect_IContextMenu2_QueryInterface unhandled", pStr, MB_OK); return E_NOINTERFACE; } /************************************************************************ * ISF_NetConnect_IContextMenu_AddRef */ -static ULONG WINAPI ISF_NetConnect_IContextMenu2_AddRef(IContextMenu2 * iface) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - return IShellFolder2_AddRef((IShellFolder2*)This); +static ULONG WINAPI ISF_NetConnect_IContextMenu3_AddRef(IContextMenu3 * iface) +{ + ULONG refCount; + IContextMenuImpl * This = (IContextMenuImpl*)iface; + + refCount = InterlockedIncrement(&This->ref); + + return refCount; } /************************************************************************ * ISF_NetConnect_IContextMenu_Release */ -static ULONG WINAPI ISF_NetConnect_IContextMenu2_Release(IContextMenu2 * iface) -{ - IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - return IShellFolder2_Release((IShellFolder2*)This); +static ULONG WINAPI ISF_NetConnect_IContextMenu3_Release(IContextMenu3 * iface) +{ + ULONG refCount; + IContextMenuImpl * This = (IContextMenuImpl*)iface; + + refCount = InterlockedDecrement(&This->ref); + if (!refCount) + { + CoTaskMemFree(This); + } + return refCount; } void WINAPI _InsertMenuItemW ( @@ -712,24 +790,25 @@ /************************************************************************** * ISF_NetConnect_IContextMenu_QueryContextMenu() */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_QueryContextMenu( - IContextMenu2 *iface, +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_QueryContextMenu( + IContextMenu3 *iface, HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - IGenericSFImpl * This = impl_from_IContextMenu2(iface); + IContextMenuImpl * This = (IContextMenuImpl*)iface; VALUEStruct * val; NETCON_PROPERTIES * pProperties; - val = _ILGetValueStruct(This->apidl); + val = _ILGetValueStruct(This->apidl); if (!val) return E_FAIL; if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) return E_FAIL; + if (pProperties->Status == NCS_HARDWARE_DISABLED) _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_ACTIVATE, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_ACTIVATE), MFS_DEFAULT); @@ -764,7 +843,6 @@ _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -784,7 +862,7 @@ HRESULT ShowNetConnectionStatus( - IGenericSFImpl * This, + IContextMenuImpl * This, INetConnection * pNetConnect, HWND hwnd) { @@ -800,7 +878,7 @@ hr = IOleCommandTarget_Exec(This->lpOleCmd, &pProperties->guidId, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); NcFreeNetconProperties(pProperties); - return hr; + return E_FAIL; } HRESULT @@ -859,23 +937,24 @@ /************************************************************************** * ISF_NetConnect_IContextMenu_InvokeCommand() */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_InvokeCommand( - IContextMenu2 *iface, +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_InvokeCommand( + IContextMenu3 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - IGenericSFImpl * This = impl_from_IContextMenu2(iface); + IContextMenuImpl * This = (IContextMenuImpl*)iface; VALUEStruct * val; - val = _ILGetValueStruct(This->apidl); if (!val) return E_FAIL; - if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS)) + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS) || + lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS-1)) //HACK for Windows XP { return ShowNetConnectionStatus(This, val->pItem, lpcmi->hwnd); } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES)) + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES) || + lpcmi->lpVerb == MAKEINTRESOURCEA(10099)) //HACK for Windows XP { /* FIXME perform version checks */ return ShowNetConnectionProperties(val->pItem, lpcmi->hwnd); @@ -888,16 +967,14 @@ * ISF_NetConnect_IContextMenu_GetCommandString() * */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_GetCommandString( - IContextMenu2 *iface, +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_GetCommandString( + IContextMenu3 *iface, UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, LPSTR lpszName, UINT uMaxNameLen) { - //IGenericSFImpl * This = impl_from_IContextMenu2(iface); - return E_FAIL; } @@ -906,28 +983,242 @@ /************************************************************************** * ISF_NetConnect_IContextMenu_HandleMenuMsg() */ -static HRESULT WINAPI ISF_NetConnect_IContextMenu2_HandleMenuMsg( - IContextMenu2 *iface, +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_HandleMenuMsg( + IContextMenu3 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam) { - //IGenericSFImpl * This = impl_from_IContextMenu2(iface); - - return E_NOTIMPL; } -static const IContextMenu2Vtbl vt_ContextMenu2 = -{ - ISF_NetConnect_IContextMenu2_QueryInterface, - ISF_NetConnect_IContextMenu2_AddRef, - ISF_NetConnect_IContextMenu2_Release, - ISF_NetConnect_IContextMenu2_QueryContextMenu, - ISF_NetConnect_IContextMenu2_InvokeCommand, - ISF_NetConnect_IContextMenu2_GetCommandString, - ISF_NetConnect_IContextMenu2_HandleMenuMsg +static HRESULT WINAPI ISF_NetConnect_IContextMenu3_HandleMenuMsg2( + IContextMenu3 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *plResult) +{ + return E_NOTIMPL; +} + + +static const IContextMenu3Vtbl vt_ContextMenu3 = +{ + ISF_NetConnect_IContextMenu3_QueryInterface, + ISF_NetConnect_IContextMenu3_AddRef, + ISF_NetConnect_IContextMenu3_Release, + ISF_NetConnect_IContextMenu3_QueryContextMenu, + ISF_NetConnect_IContextMenu3_InvokeCommand, + ISF_NetConnect_IContextMenu3_GetCommandString, + ISF_NetConnect_IContextMenu3_HandleMenuMsg, + ISF_NetConnect_IContextMenu3_HandleMenuMsg2 }; + +static HRESULT WINAPI ISF_NetConnect_IObjectWithSite_QueryInterface (IObjectWithSite * iface, + REFIID iid, LPVOID * ppvObj) +{ + IContextMenuImpl * This = impl_from_IObjectWithSite(iface); + + if (IsEqualIID(iid, &IID_IObjectWithSite)) + { + *ppvObj = (IUnknown*)&This->lpVtblObjectWithSite; + return S_OK; + } + return E_NOINTERFACE; +} + +/************************************************************************ + * ISF_NetConnect_IQueryInfo_AddRef + */ +static ULONG WINAPI ISF_NetConnect_IObjectWithSite_AddRef (IObjectWithSite * iface) +{ + IContextMenuImpl * This = impl_from_IObjectWithSite(iface); + + return IContextMenu2_AddRef((IContextMenu2*)This); +} + +/************************************************************************ + * ISF_NetConnect_IQueryInfo_Release + */ +static ULONG WINAPI ISF_NetConnect_IObjectWithSite_Release (IObjectWithSite * iface) +{ + IContextMenuImpl * This = impl_from_IObjectWithSite(iface); + + return IContextMenu_Release((IContextMenu*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Release + */ +static HRESULT WINAPI ISF_NetConnect_IObjectWithSite_GetSite (IObjectWithSite * iface, REFIID riid, PVOID *ppvSite) +{ + HRESULT hr; + IUnknown *pUnknown; + IContextMenuImpl * This = impl_from_IObjectWithSite(iface); + + if (!This->pUnknown) + { + *ppvSite = NULL; + return E_FAIL; + } + + hr = IUnknown_QueryInterface(This->pUnknown, riid, (LPVOID*)&pUnknown); + if (SUCCEEDED(hr)) + { + IUnknown_AddRef(pUnknown); + *ppvSite = pUnknown; + return S_OK; + } + + *ppvSite = NULL; + return hr; +} + +static HRESULT WINAPI ISF_NetConnect_IObjectWithSite_SetSite (IObjectWithSite * iface, IUnknown *pUnkSite) +{ + IContextMenuImpl * This = impl_from_IObjectWithSite(iface); + + if(!pUnkSite) + { + if (This->pUnknown) + { + IUnknown_Release(This->pUnknown); + This->pUnknown = NULL; + } + } + else + { + IUnknown_AddRef(pUnkSite); + if (This->pUnknown) + IUnknown_Release(This->pUnknown); + This->pUnknown = pUnkSite; + } + + return S_OK; +} + + +static const IObjectWithSiteVtbl vt_ObjectWithSite = +{ + ISF_NetConnect_IObjectWithSite_QueryInterface, + ISF_NetConnect_IObjectWithSite_AddRef, + ISF_NetConnect_IObjectWithSite_Release, + ISF_NetConnect_IObjectWithSite_SetSite, + ISF_NetConnect_IObjectWithSite_GetSite +}; + +static HRESULT WINAPI ISF_NetConnect_IExtractIconW_QueryInterface (IExtractIconW * iface, + REFIID iid, LPVOID * ppvObj) +{ + IContextMenuImpl * This = impl_from_IExtractIcon(iface); + + if (IsEqualIID(iid, &IID_IExtractIconW)) + { + *ppvObj = (IUnknown*)&This->lpVtblExtractIconW; + return S_OK; + } + return E_NOINTERFACE; +} + +/************************************************************************ + * ISF_NetConnect_IExtractIcon_AddRef + */ +static ULONG WINAPI ISF_NetConnect_IExtractIconW_AddRef (IExtractIconW * iface) +{ + IContextMenuImpl * This = impl_from_IExtractIcon(iface); + + return IContextMenu2_AddRef((IContextMenu2*)This); +} + +/************************************************************************ + * ISF_NetConnect_IExtractIcon_Release + */ +static ULONG WINAPI ISF_NetConnect_IExtractIconW_Release (IExtractIconW * iface) +{ + IContextMenuImpl * This = impl_from_IExtractIcon(iface); + + return IContextMenu_Release((IContextMenu*)This); +} + +/************************************************************************ + * ISF_NetConnect_IExtractIcon_GetIconLocation + */ +static HRESULT WINAPI ISF_NetConnect_IExtractIconW_GetIconLocation( + IExtractIconW * iface, + UINT uFlags, + LPWSTR szIconFile, + UINT cchMax, + int *piIndex, + UINT *pwFlags) +{ + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + IContextMenuImpl * This = impl_from_IExtractIcon(iface); + + *pwFlags = 0; + if (!GetModuleFileNameW(netshell_hInstance, szIconFile, cchMax)) + return E_FAIL; + + val = _ILGetValueStruct(This->apidl); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties(val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (pProperties->Status == NCS_CONNECTED || pProperties->Status == NCS_CONNECTING) + *piIndex = IDI_NET_IDLE; + else + *piIndex = IDI_NET_OFF; + + NcFreeNetconProperties(pProperties); + + return NOERROR; +} + +/************************************************************************ + * ISF_NetConnect_IExtractIcon_Extract + */ +static HRESULT WINAPI ISF_NetConnect_IExtractIconW_Extract( + IExtractIconW * iface, + LPCWSTR pszFile, + UINT nIconIndex, + HICON *phiconLarge, + HICON *phiconSmall, + UINT nIconSize) +{ + //IContextMenuImpl * This = impl_from_IExtractIcon(iface); + if (nIconIndex == IDI_NET_IDLE) + { + *phiconLarge = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + *phiconSmall = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + return NOERROR; + } + else if (nIconIndex == IDI_NET_OFF) + { + *phiconLarge = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + *phiconSmall = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + return NOERROR; + } + + return S_FALSE; +} + +static const IExtractIconWVtbl vt_ExtractIconW = +{ + ISF_NetConnect_IExtractIconW_QueryInterface, + ISF_NetConnect_IExtractIconW_AddRef, + ISF_NetConnect_IExtractIconW_Release, + ISF_NetConnect_IExtractIconW_GetIconLocation, + ISF_NetConnect_IExtractIconW_Extract +}; + + + + + + /************************************************************************ * ISF_NetConnect_PersistFolder2_QueryInterface @@ -1019,13 +1310,25 @@ ISF_NetConnect_PersistFolder2_GetCurFolder }; +#if 0 +static const IPersistIDListVtbl vt_PersistIDList = +{ + ISF_NetConnect_PersistIDList_QueryInterface, + ISF_NetConnect_PersistIDList_AddRef, + ISF_NetConnect_PersistIDList_Release, + ISF_NetConnect_PersistIDList_GetClassID, + ISF_NetConnect_PersistIDList_SetIDList, + ISF_NetConnect_PersistIDList_GetIDList, +}; +#endif + /************************************************************************ * ISF_NetConnect_PersistFolder2_QueryInterface */ static HRESULT WINAPI ISF_NetConnect_IQueryInfo_QueryInterface (IQueryInfo * iface, REFIID iid, LPVOID * ppvObj) { - IGenericSFImpl * This = impl_from_IQueryInfo(iface); + IContextMenuImpl * This = impl_from_IQueryInfo(iface); if (IsEqualIID(iid, &IID_IQueryInfo)) { @@ -1041,9 +1344,9 @@ */ static ULONG WINAPI ISF_NetConnect_IQueryInfo_AddRef (IQueryInfo * iface) { - IGenericSFImpl * This = impl_from_IQueryInfo(iface); - - return IShellFolder2_AddRef((IShellFolder2*)This); + IContextMenuImpl * This = impl_from_IQueryInfo(iface); + + return IContextMenu2_AddRef((IContextMenu2*)This); } /************************************************************************ @@ -1051,9 +1354,9 @@ */ static ULONG WINAPI ISF_NetConnect_IQueryInfo_Release (IQueryInfo * iface) { - IGenericSFImpl * This = impl_from_IQueryInfo(iface); - - return IShellFolder2_Release((IShellFolder2*)This); + IContextMenuImpl * This = impl_from_IQueryInfo(iface); + + return IContextMenu_Release((IContextMenu*)This); } /************************************************************************ @@ -1110,15 +1413,14 @@ sf->ref = 1; sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_PersistFolder2; - sf->lpVtblContextMenu = &vt_ContextMenu2; - sf->lpVtblQueryInfo = &vt_QueryInfo; hr = CoCreateInstance(&CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (LPVOID*)&sf->lpOleCmd); if (FAILED(hr)) sf->lpOleCmd = NULL; else + { IOleCommandTarget_Exec(sf->lpOleCmd, &CGID_ShellServiceObject, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - + } sf->pidlRoot = _ILCreateNetConnect(); /* my qualified pidl */

1 0

[sginsberg] 36705: - SVN maintenance
by sginsberg＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: sginsberg Date: Fri Oct 10 08:34:27 2008 New Revision: 36705 URL: http://svn.reactos.org/svn/reactos?rev=36705&view=rev Log: - SVN maintenance Modified: trunk/reactos/drivers/base/bootvid/precomp.h (props changed) Propchange: trunk/reactos/drivers/base/bootvid/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 36704: - Don't use uninitialized INetConnection item - should fix bug 3754
by janderwald＠svn.reactos.org 10 Oct '08

10 Oct '08

Author: janderwald Date: Fri Oct 10 04:36:39 2008 New Revision: 36704 URL: http://svn.reactos.org/svn/reactos?rev=36704&view=rev Log: - Don't use uninitialized INetConnection item - should fix bug 3754 Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Fri Oct 10 04:36:39 2008 @@ -522,7 +522,7 @@ pItem = This->pHead; while(pItem) { - hr = INetConnection_GetProperties(INetCon, &pProps); + hr = INetConnection_GetProperties(pItem->pNet, &pProps); if (SUCCEEDED(hr)) { ZeroMemory(&nid, sizeof(nid)); @@ -541,7 +541,7 @@ } pItem = pItem->pNext; } - return S_OK; + return S_OK; } /* get an instance to of IConnectionManager */ @@ -767,7 +767,7 @@ HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { ILanStatusImpl * This; - static ILanStatusImpl *cached_This = NULL; + static volatile ILanStatusImpl *cached_This = NULL; if (!ppv) return E_POINTER; @@ -784,7 +784,7 @@ This->lpNetMan = NULL; This->pHead = NULL; - if (InterlockedCompareExchangePointer((void *)&cached_This, This, NULL) != NULL) + if (InterlockedCompareExchangePointer((volatile void **)&cached_This, This, NULL) != NULL) { CoTaskMemFree(This); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs