Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[tkreuzer] 65255: Merged revision(s) 62353, 62531-62532, 62853, 64152, 64173-64174 from branches/kernel-fun/reactos: [NTOSKRNL] Implement SystemPrioritySeperation case in NtSetSystemInformation ......
by tkreuzer＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tkreuzer Date: Tue Nov 4 20:47:18 2014 New Revision: 65255 URL: http://svn.reactos.org/svn/reactos?rev=65255&view=rev Log: Merged revision(s) 62353, 62531-62532, 62853, 64152, 64173-64174 from branches/kernel-fun/reactos: [NTOSKRNL] Implement SystemPrioritySeperation case in NtSetSystemInformation ........ [NTOSKRNL] Fix an ASSERT in ExfReleasePushLockExclusive ........ [NTOSKRNL] Fix KiCallbackReturnHandler ........ [NTOSKRNL] Don't expect a fully sized LOADER_PARAMETER_EXTENSION, since the win2003 loader doesn't provide the full one. ........ [NTOSKRNL] Implement a fake NtLockProductActivationKeys ........ [NTOSKRNL] - Add some DPRINTs on errors - Silence a DPRINT - Only DPRINT on unimplemented affinity support on SMP builds ........ [NTOSKRNL] - Remove an undocumented flag from the lpc request type in NtRequestWaitReplyPort. This is required for some windows modules that use this flag, otherwise the function fails. ........ Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/pushlock.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/lpc/connect.c trunk/reactos/ntoskrnl/lpc/send.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 4 20:47:18 2014 @@ -6,7 +6,7 @@ /branches/condrv_restructure:63104-64101 /branches/header-work:45691-47721 /branches/kd++:58883-58973 -/branches/kernel-fun/reactos:62304,65253 +/branches/kernel-fun/reactos:62304,62353,62531-62532,62853,64152,64173-64174,65253 /branches/ntvdm:59241-63176 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 /branches/reactx/reactos:49994-49995 Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -15,6 +15,7 @@ BOOLEAN CmBootAcceptFirstTime = TRUE; BOOLEAN CmFirstTime = TRUE; +extern ULONG InitSafeBootMode; /* FUNCTIONS *****************************************************************/ @@ -947,7 +948,7 @@ /* Enough of the system has booted by now */ Ki386PerfEnd(); - + /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; @@ -1016,13 +1017,52 @@ return STATUS_NOT_IMPLEMENTED; } +// FIXME: different for different windows versions! +#define PRODUCT_ACTIVATION_VERSION 7749 + NTSTATUS NTAPI NtLockProductActivationKeys(IN PULONG pPrivateVer, IN PULONG pSafeMode) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + + PreviousMode = ExGetPreviousMode(); + _SEH2_TRY + { + /* Check if the caller asked for the version */ + if (pPrivateVer != NULL) + { + /* For user mode, probe it */ + if (PreviousMode != KernelMode) + { + ProbeForRead(pPrivateVer, sizeof(ULONG), sizeof(ULONG)); + } + + /* Return the expected version */ + *pPrivateVer = PRODUCT_ACTIVATION_VERSION; + } + + /* Check if the caller asked for safe mode mode state */ + if (pSafeMode != NULL) + { + /* For user mode, probe it */ + if (PreviousMode != KernelMode) + { + ProbeForRead(pSafeMode, sizeof(ULONG), sizeof(ULONG)); + } + + /* Return the safe boot mode state */ + *pSafeMode = InitSafeBootMode; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=652… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -13,6 +13,10 @@ #include <reactos/buildno.h> #define NDEBUG #include <debug.h> + +/* This is the size that we can expect from the win 2003 loader */ +#define LOADER_PARAMETER_EXTENSION_MIN_SIZE \ + RTL_SIZEOF_THROUGH_FIELD(LOADER_PARAMETER_EXTENSION, AcpiTableSize) /* Temporary hack */ BOOLEAN @@ -759,8 +763,8 @@ /* Get the loader extension */ Extension = LoaderBlock->Extension; - /* Validate the size (larger structures are OK, we'll just ignore them) */ - if (Extension->Size < sizeof(LOADER_PARAMETER_EXTENSION)) return FALSE; + /* Validate the size (Windows 2003 loader doesn't provide more) */ + if (Extension->Size < LOADER_PARAMETER_EXTENSION_MIN_SIZE) return FALSE; /* Don't validate upper versions */ if (Extension->MajorVersion > VER_PRODUCTMAJORVERSION) return TRUE; Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -1130,7 +1130,7 @@ NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_LOCK; /* Sanity check */ - ASSERT(NewValue.Waking && !NewValue.Waiting); + ASSERT(NewValue.Waking || !NewValue.Waiting); /* Write the New Value */ NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -1788,9 +1788,22 @@ /* Class 39 - Priority Separation */ SSI_DEF(SystemPrioritySeperation) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemPrioritySeperation not implemented\n"); - return STATUS_NOT_IMPLEMENTED; + /* Check if the size is correct */ + if (Size != sizeof(ULONG)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* We need the TCB privilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, ExGetPreviousMode())) + { + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Modify the quantum table */ + PsChangeQuantumTable(TRUE, *(PULONG)Buffer); + + return STATUS_SUCCESS; } /* Class 40 - Plug Play Bus Information */ Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -1580,6 +1580,8 @@ if (OpenPacket.ParseCheck != TRUE) { /* Parse failed */ + DPRINT1("IopQueryAttributesFile failed for '%wZ' with 0x%lx\n", + ObjectAttributes->ObjectName, Status); return Status; } else @@ -1802,6 +1804,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1815,6 +1818,7 @@ (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) { /* Invalid named pipe create */ + DPRINT1("Invalid named pipe create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1823,6 +1827,7 @@ /* Make sure we have extra parameters */ if (!ExtraCreateParameters) { + DPRINT1("Invalid parameter: ExtraCreateParameters == 0!\n"); return STATUS_INVALID_PARAMETER; } @@ -1833,6 +1838,7 @@ (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) { /* Invalid mailslot create */ + DPRINT1("Invalid mailslot create\n"); return STATUS_INVALID_PARAMETER; } } @@ -1936,6 +1942,7 @@ if (!OpenPacket->EaBuffer) { ExFreePool(OpenPacket); + DPRINT1("Failed to allocate open packet EA buffer\n"); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -1517,7 +1517,17 @@ FASTCALL KiCallbackReturnHandler(IN PKTRAP_FRAME TrapFrame) { + PKTHREAD Thread; NTSTATUS Status; + + /* Save the SEH chain, NtCallbackReturn will restore this */ + TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; + + /* Set thread fields */ + Thread = KeGetCurrentThread(); + Thread->TrapFrame = TrapFrame; + Thread->PreviousMode = KiUserTrap(TrapFrame); + NT_ASSERT(Thread->PreviousMode != KernelMode); /* Pass the register parameters to NtCallbackReturn. Result pointer is in ecx, result length in edx, status in eax */ Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -696,8 +696,10 @@ /* Check if system affinity is disabled */ if (!Thread->SystemAffinityActive) { +#ifdef CONFIG_SMP /* FIXME: TODO */ DPRINT1("Affinity support disabled!\n"); +#endif } /* Return the old affinity */ Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -139,7 +139,11 @@ PreviousMode, NULL, (PVOID *)&Port); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port '%wZ': 0x%lx\n", PortName, Status); + return Status; + } /* This has to be a connection port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) @@ -352,7 +356,7 @@ ConnectMessage->SectionToMap = SectionToMap; /* Set the data for the connection request message */ - Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + + Message->Request.u1.s1.DataLength = (CSHORT)ConnectionInfoLength + sizeof(LPCP_CONNECTION_MESSAGE); Message->Request.u1.s1.TotalLength = sizeof(LPCP_MESSAGE) + Message->Request.u1.s1.DataLength; Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=65… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Tue Nov 4 20:47:18 2014 @@ -744,6 +744,9 @@ } } + /* This flag is undocumented. Remove it before continuing */ + LocalLpcRequest.u2.s2.Type &= ~0x4000; + /* Check if this is an LPC Request */ if (LpcpGetMessageType(&LocalLpcRequest) == LPC_REQUEST) {

1 0

[tkreuzer] 65254: [NTOSKRNL] Merge r62304 and r65253 from kernel-fun branch: Fix logic in ObSetSecurityDescriptorInfo. To understand the change: it is not only style change! The old code modified S...
by tkreuzer＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tkreuzer Date: Tue Nov 4 20:41:10 2014 New Revision: 65254 URL: http://svn.reactos.org/svn/reactos?rev=65254&view=rev Log: [NTOSKRNL] Merge r62304 and r65253 from kernel-fun branch: Fix logic in ObSetSecurityDescriptorInfo. To understand the change: it is not only style change! The old code modified SecurityDescriptor, which must always stay the same in the loop! Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/ob/obsecure.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 4 20:41:10 2014 @@ -6,6 +6,7 @@ /branches/condrv_restructure:63104-64101 /branches/header-work:45691-47721 /branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62304,65253 /branches/ntvdm:59241-63176 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 /branches/reactx/reactos:49994-49995 Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Tue Nov 4 20:41:10 2014 @@ -144,60 +144,53 @@ &NewDescriptor, PoolType, GenericMapping); - if (NT_SUCCESS(Status)) - { - /* Now add this to the cache */ - Status = ObLogSecurityDescriptor(NewDescriptor, - &CachedDescriptor, - MAX_FAST_REFS + 1); - - /* Let go of our uncached copy */ - ExFreePool(NewDescriptor); - - /* Check for success */ - if (NT_SUCCESS(Status)) - { - /* Do the swap */ - FastRef = (PEX_FAST_REF)OutputSecurityDescriptor; - OldValue = ExCompareSwapFastReference(FastRef, - CachedDescriptor, - OldDescriptor); - - /* Get the security descriptor */ - SecurityDescriptor = ExGetObjectFastReference(OldValue); - Count = ExGetCountFastReference(OldValue); - - /* Make sure the swap worked */ - if (SecurityDescriptor == OldDescriptor) - { - /* Flush waiters */ - ObpAcquireObjectLock(ObjectHeader); - ObpReleaseObjectLock(ObjectHeader); - - /* And dereference the old one */ - ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); - break; - } - else - { - /* Someone changed it behind our back -- try again */ - ObDereferenceSecurityDescriptor(OldDescriptor, 1); - ObDereferenceSecurityDescriptor(CachedDescriptor, - MAX_FAST_REFS + 1); - } - } - else - { - /* We failed, dereference the old one */ - ObDereferenceSecurityDescriptor(OldDescriptor, 1); - break; - } - } - else + if (!NT_SUCCESS(Status)) { /* We failed, dereference the old one */ if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); break; + } + + /* Now add this to the cache */ + Status = ObLogSecurityDescriptor(NewDescriptor, + &CachedDescriptor, + MAX_FAST_REFS + 1); + + /* Let go of our uncached copy */ + ExFreePool(NewDescriptor); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the old one */ + ObDereferenceSecurityDescriptor(OldDescriptor, 1); + break; + } + + /* Do the swap */ + FastRef = (PEX_FAST_REF)OutputSecurityDescriptor; + OldValue = ExCompareSwapFastReference(FastRef, + CachedDescriptor, + OldDescriptor); + + /* Make sure the swap worked */ + if (ExGetObjectFastReference(OldValue) == OldDescriptor) + { + /* Flush waiters */ + ObpAcquireObjectLock(ObjectHeader); + ObpReleaseObjectLock(ObjectHeader); + + /* And dereference the old one */ + Count = ExGetCountFastReference(OldValue); + ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); + break; + } + else + { + /* Someone changed it behind our back -- try again */ + ObDereferenceSecurityDescriptor(OldDescriptor, 1); + ObDereferenceSecurityDescriptor(CachedDescriptor, + MAX_FAST_REFS + 1); } }

1 0

[tkreuzer] 65253: [NTOSKRNL] Fix the fix to ObSetSecurityDescriptorInfo. To understand the change: it is not only style change! The old code modified SecurityDescriptor, which must always stay the ...
by tkreuzer＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tkreuzer Date: Tue Nov 4 20:37:54 2014 New Revision: 65253 URL: http://svn.reactos.org/svn/reactos?rev=65253&view=rev Log: [NTOSKRNL] Fix the fix to ObSetSecurityDescriptorInfo. To understand the change: it is not only style change! The old code modified SecurityDescriptor, which must always stay the same in the loop! Modified: branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c Modified: branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/ob/… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Tue Nov 4 20:37:54 2014 @@ -131,27 +131,26 @@ /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - - /* Reference the old descriptor */ - OldDescriptor = ObpReferenceSecurityDescriptor(ObjectHeader); - NewDescriptor = OldDescriptor; - - /* Set the SD information */ - Status = SeSetSecurityDescriptorInfo(Object, - SecurityInformation, - SecurityDescriptor, - &NewDescriptor, - PoolType, - GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* We failed, dereference the old one */ - if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); - return Status; - } - while (TRUE) { + /* Reference the old descriptor */ + OldDescriptor = ObpReferenceSecurityDescriptor(ObjectHeader); + NewDescriptor = OldDescriptor; + + /* Set the SD information */ + Status = SeSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + &NewDescriptor, + PoolType, + GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the old one */ + if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); + break; + } + /* Now add this to the cache */ Status = ObLogSecurityDescriptor(NewDescriptor, &CachedDescriptor, @@ -174,18 +173,15 @@ CachedDescriptor, OldDescriptor); - /* Get the security descriptor */ - SecurityDescriptor = ExGetObjectFastReference(OldValue); - Count = ExGetCountFastReference(OldValue); - /* Make sure the swap worked */ - if (SecurityDescriptor == OldDescriptor) + if (ExGetObjectFastReference(OldValue) == OldDescriptor) { /* Flush waiters */ ObpAcquireObjectLock(ObjectHeader); ObpReleaseObjectLock(ObjectHeader); /* And dereference the old one */ + Count = ExGetCountFastReference(OldValue); ObDereferenceSecurityDescriptor(OldDescriptor, Count + 2); break; }

1 0

[tkreuzer] 65252: [WIN32K] - Fix completely broken REGION_CropAndOffsetRegion - Make sure iType is correctly set in NtGdiGetRegionData
by tkreuzer＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tkreuzer Date: Tue Nov 4 20:20:45 2014 New Revision: 65252 URL: http://svn.reactos.org/svn/reactos?rev=65252&view=rev Log: [WIN32K] - Fix completely broken REGION_CropAndOffsetRegion - Make sure iType is correctly set in NtGdiGetRegionData Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Tue Nov 4 20:20:45 2014 @@ -577,7 +577,7 @@ pReg->rdh.iType = RDH_RECTANGLES; } -// FIXME: This seems to be wrong +// FIXME: This function needs review and testing /*********************************************************************** * REGION_CropAndOffsetRegion */ @@ -649,82 +649,106 @@ else // Region box and clipping rect appear to intersect { PRECTL lpr, rpr; - ULONG i, j, clipa, clipb; - INT left = rgnSrc->rdh.rcBound.right + off->x; - INT right = rgnSrc->rdh.rcBound.left + off->x; - - for (clipa = 0; (rgnSrc->Buffer + clipa)->bottom <= rect->top; clipa++) - // Region and rect intersect so we stop before clipa > rgnSrc->rdh.nCount - ; // skip bands above the clipping rectangle - + ULONG i, j, clipa, clipb, nRgnSize; + INT left = MAXLONG; + INT right = MINLONG; + INT top = MAXLONG; + INT bottom = MINLONG; + + /* Skip all rects that are completely above our intersect rect */ + for (clipa = 0; clipa < rgnSrc->rdh.nCount; clipa++) + { + /* bottom is exclusive, so break when we go above it */ + if (rgnSrc->Buffer[clipa].bottom > rect->top) break; + } + + /* Bail out, if there is nothing left */ + if (clipa == rgnSrc->rdh.nCount) goto empty; + + /* Find the last rect that is still within the intersect rect (exclusive) */ for (clipb = clipa; clipb < rgnSrc->rdh.nCount; clipb++) - if ((rgnSrc->Buffer + clipb)->top >= rect->bottom) - break; // and below it + { + /* bottom is exclusive, so stop, when we start at that y pos */ + if (rgnSrc->Buffer[clipb].top >= rect->bottom) break; + } + + /* Bail out, if there is nothing left */ + if (clipb == clipa) goto empty; // clipa - index of the first rect in the first intersecting band - // clipb - index of the last rect in the last intersecting band - - if ((rgnDst != rgnSrc) && (rgnDst->rdh.nCount < (i = (clipb - clipa)))) + // clipb - index of the last rect in the last intersecting band plus 1 + + /* Check if the buffer in the dest region is large enough, + otherwise allocate a new one */ + nRgnSize = (clipb - clipa) * sizeof(RECT); + if ((rgnDst != rgnSrc) && (rgnDst->rdh.nRgnSize < nRgnSize)) { PRECTL temp; - temp = ExAllocatePoolWithTag(PagedPool, i * sizeof(RECT), TAG_REGION); + temp = ExAllocatePoolWithTag(PagedPool, nRgnSize, TAG_REGION); if (!temp) return ERROR; - if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // free the old buffer + /* Free the old buffer */ + if (rgnDst->Buffer && (rgnDst->Buffer != &rgnDst->rdh.rcBound)) + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); + rgnDst->Buffer = temp; - rgnDst->rdh.nCount = i; - rgnDst->rdh.nRgnSize = i * sizeof(RECT); - } - + rgnDst->rdh.nCount = 0; + rgnDst->rdh.nRgnSize = nRgnSize; + rgnDst->rdh.iType = RDH_RECTANGLES; + } + + /* Loop all rects within the intersect rect from the y perspective */ for (i = clipa, j = 0; i < clipb ; i++) { // i - src index, j - dst index, j is always <= i for obvious reasons - lpr = rgnSrc->Buffer + i; - - if (lpr->left < rect->right && lpr->right > rect->left) + lpr = &rgnSrc->Buffer[i]; + + /* Make sure the source rect is not retarded */ + ASSERT(lpr->bottom > rect->top); + ASSERT(lpr->right > rect->left); + + /* We already checked above, this should hold true */ + ASSERT(lpr->bottom > rect->top); + ASSERT(lpr->top < rect->bottom); + + /* Check if this rect is really inside the intersect rect */ + if ((lpr->left < rect->right) && (lpr->right > rect->left)) { - rpr = rgnDst->Buffer + j; - - rpr->top = lpr->top + off->y; - rpr->bottom = lpr->bottom + off->y; - rpr->left = ((lpr->left > rect->left) ? lpr->left : rect->left) + off->x; - rpr->right = ((lpr->right < rect->right) ? lpr->right : rect->right) + off->x; - + rpr = &rgnDst->Buffer[j]; + + /* Crop the rect with the intersect rect and add offset */ + rpr->top = max(lpr->top, rect->top) + off->y; + rpr->bottom = min(lpr->bottom, rect->bottom) + off->y; + rpr->left = max(lpr->left, rect->left) + off->x; + rpr->right = min(lpr->right, rect->right) + off->y; + + /* Make sure the resulting rect is not retarded */ + ASSERT(lpr->bottom > rect->top); + ASSERT(lpr->right > rect->left); + + /* Track new bounds */ if (rpr->left < left) left = rpr->left; if (rpr->right > right) right = rpr->right; - + if (rpr->top < top) top = rpr->top; + if (rpr->bottom > bottom) bottom = rpr->bottom; + + /* Next target rect */ j++; } } if (j == 0) goto empty; + /* Update the bounds rect */ rgnDst->rdh.rcBound.left = left; rgnDst->rdh.rcBound.right = right; - - left = rect->top + off->y; - right = rect->bottom + off->y; - - rgnDst->rdh.nCount = j--; - for (i = 0; i <= j; i++) // Fixup top band - if ((rgnDst->Buffer + i)->top < left) - (rgnDst->Buffer + i)->top = left; - else - break; - - for (i = j; i > 0; i--) // Fixup bottom band - if ((rgnDst->Buffer + i)->bottom > right) - (rgnDst->Buffer + i)->bottom = right; - else - break; - - rgnDst->rdh.rcBound.top = (rgnDst->Buffer)->top; - rgnDst->rdh.rcBound.bottom = (rgnDst->Buffer + j)->bottom; - - rgnDst->rdh.iType = RDH_RECTANGLES; + rgnDst->rdh.rcBound.top = top; + rgnDst->rdh.rcBound.bottom = bottom; + + /* Set new rect count */ + rgnDst->rdh.nCount = j; } return REGION_Complexity(rgnDst); @@ -732,15 +756,9 @@ empty: if (!rgnDst->Buffer) { - rgnDst->Buffer = ExAllocatePoolWithTag(PagedPool, RGN_DEFAULT_RECTS * sizeof(RECT), TAG_REGION); - if (rgnDst->Buffer) - { - rgnDst->rdh.nCount = RGN_DEFAULT_RECTS; - rgnDst->rdh.nRgnSize = RGN_DEFAULT_RECTS * sizeof(RECT); - } - else - return ERROR; - } + rgnDst->Buffer = &rgnDst->rdh.rcBound; + } + EMPTY_REGION(rgnDst); return NULLREGION; } @@ -4004,6 +4022,7 @@ ProbeForWrite(lpRgnData, cjSize, sizeof(ULONG)); RtlCopyMemory(lpRgnData, &prgn->rdh, sizeof(RGNDATAHEADER)); RtlCopyMemory(lpRgnData->Buffer, prgn->Buffer, cjRects); + lpRgnData->rdh.iType = RDH_RECTANGLES; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[akhaldi] 65251: [SHELL32] * Partial sync of brsfolder.c with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: akhaldi Date: Tue Nov 4 20:13:22 2014 New Revision: 65251 URL: http://svn.reactos.org/svn/reactos?rev=65251&view=rev Log: [SHELL32] * Partial sync of brsfolder.c with Wine 1.7.27. CORE-8540 Modified: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c Modified: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Tue Nov 4 20:13:22 2014 @@ -195,7 +195,7 @@ HIMAGELIST hImageList; HRESULT hr; IShellFolder *lpsfParent, *lpsfRoot; - IEnumIDList * pEnumChildren; + IEnumIDList * pEnumChildren = NULL; HTREEITEM item; DWORD flags; LPCITEMIDLIST root = info->lpBrowseInfo->pidlRoot; @@ -245,14 +245,16 @@ return; } - if (pidlChild && pidlChild->mkid.cb) { + if (!_ILIsEmpty(pidlChild)) { hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); } else { lpsfRoot = lpsfParent; + hr = IShellFolder_AddRef(lpsfParent); } if (FAILED(hr)) { WARN("Could not bind to root shell folder! hr = %08x\n", hr); + IShellFolder_Release(lpsfParent); ILFree(pidlChild); ILFree(pidlParent); return; @@ -262,6 +264,8 @@ hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); if (FAILED(hr)) { WARN("Could not get child iterator! hr = %08x\n", hr); + IShellFolder_Release(lpsfParent); + IShellFolder_Release(lpsfRoot); ILFree(pidlChild); ILFree(pidlParent); return; @@ -274,6 +278,8 @@ ILFree(pidlChild); ILFree(pidlParent); + IShellFolder_Release(lpsfRoot); + IShellFolder_Release(lpsfParent); } static int GetIcon(LPCITEMIDLIST lpi, UINT uFlags) @@ -423,8 +429,8 @@ while (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)) { ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; - IEnumIDList* pEnumIL; - IShellFolder* pSFChild; + IEnumIDList* pEnumIL = NULL; + IShellFolder* pSFChild = NULL; IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); if (ulAttrs & SFGAO_FOLDER) { @@ -438,9 +444,11 @@ if ((IEnumIDList_Skip(pEnumIL, 1) != S_OK) || FAILED(IEnumIDList_Reset(pEnumIL))) { + IEnumIDList_Release(pEnumIL); pEnumIL = NULL; } } + IShellFolder_Release(pSFChild); } } @@ -519,7 +527,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv ) { - IShellFolder *lpsf2; + IShellFolder *lpsf2 = NULL; LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; HRESULT r; @@ -528,7 +536,7 @@ if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) return 0; - if (lptvid->lpi && lptvid->lpi->mkid.cb) { + if (!_ILIsEmpty(lptvid->lpi)) { r = IShellFolder_BindToObject(lptvid->lpsfParent, lptvid->lpi, 0, &IID_IShellFolder, (void**)&lpsf2); } else { lpsf2 = lptvid->lpsfParent; @@ -564,7 +572,7 @@ browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); - return 0; + return S_OK; } static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) @@ -745,6 +753,7 @@ if(FAILED(hr)) return hr; hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur); + IShellFolder_Release(desktop); if(FAILED(hr)) return hr; @@ -760,6 +769,7 @@ if(len<MAX_PATH) name[len++] = '\\'; hr = ISFHelper_GetUniqueName(sfhelper, &name[len], MAX_PATH-len); + ISFHelper_Release(sfhelper); if(FAILED(hr)) goto cleanup; @@ -801,6 +811,7 @@ goto cleanup; added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); + IShellFolder_Release(cur); SHFree(new_item); SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); @@ -859,6 +870,7 @@ hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPOLESTR)selection, NULL, &pidlSelection, NULL); + IShellFolder_Release(psfDesktop); if (FAILED(hr)) goto done; }

1 0

[akhaldi] 65250: [SHELL32] * Move brsfolder.cpp to the wine folder. * Convert brsfolder.cpp into brsfolder.c.
by akhaldi＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: akhaldi Date: Tue Nov 4 20:10:43 2014 New Revision: 65250 URL: http://svn.reactos.org/svn/reactos?rev=65250&view=rev Log: [SHELL32] * Move brsfolder.cpp to the wine folder. * Convert brsfolder.cpp into brsfolder.c. Added: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c - copied, changed from r65246, branches/shell-experiments/dll/win32/shell32/brsfolder.cpp Removed: branches/shell-experiments/dll/win32/shell32/brsfolder.cpp Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue Nov 4 20:10:43 2014 @@ -17,7 +17,6 @@ list(APPEND SOURCE CAutoComplete.cpp - brsfolder.cpp changenotify.cpp classes.cpp clipboard.cpp @@ -68,6 +67,7 @@ add_library(shell32 SHARED ${SOURCE} + wine/brsfolder.c wine/control.c wine/pidl.c wine/shell32_main.c Removed: branches/shell-experiments/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/brsfolder.cpp (removed) @@ -1,1114 +0,0 @@ -/* - * Copyright 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * FIXME: - * - many memory leaks - * - many flags unimplemented - * - implement new dialog style "make new folder" button - * - implement editbox - * - implement new dialog style resizing - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/* original margins and control size */ -typedef struct tagLAYOUT_DATA -{ - LONG left, width, right; - LONG top, height, bottom; -} LAYOUT_DATA; - -typedef struct tagbrowse_info -{ - HWND hWnd; - HWND hwndTreeView; - LPBROWSEINFOW lpBrowseInfo; - LPITEMIDLIST pidlRet; - LAYOUT_DATA *layout; /* filled by LayoutInit, used by LayoutUpdate */ - SIZE szMin; -} browse_info; - -typedef struct tagTV_ITEMDATA -{ - IShellFolder* lpsfParent; /* IShellFolder of the parent */ - LPITEMIDLIST lpi; /* PIDL relative to parent */ - LPITEMIDLIST lpifq; /* Fully qualified PIDL */ - IEnumIDList* pEnumIL; /* Children iterator */ -} TV_ITEMDATA, *LPTV_ITEMDATA; - -typedef struct tagLAYOUT_INFO -{ - int iItemId; /* control id */ - DWORD dwAnchor; /* BF_* flags specifying which margins should remain constant */ -} LAYOUT_INFO; - -static const LAYOUT_INFO g_layout_info[] = -{ - {IDC_BROWSE_FOR_FOLDER_TITLE, BF_TOP|BF_LEFT|BF_RIGHT}, - {IDC_BROWSE_FOR_FOLDER_STATUS, BF_TOP|BF_LEFT|BF_RIGHT}, - {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT}, - {IDC_BROWSE_FOR_FOLDER_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT}, - {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_BOTTOM|BF_LEFT}, - {IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT}, - {IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, BF_BOTTOM|BF_LEFT}, - {IDOK, BF_BOTTOM|BF_RIGHT}, - {IDCANCEL, BF_BOTTOM|BF_RIGHT} -}; - -#define LAYOUT_INFO_COUNT (sizeof(g_layout_info)/sizeof(g_layout_info[0])) - -#define SUPPORTEDFLAGS (BIF_STATUSTEXT | \ - BIF_BROWSEFORCOMPUTER | \ - BIF_RETURNFSANCESTORS | \ - BIF_RETURNONLYFSDIRS | \ - BIF_NONEWFOLDERBUTTON | \ - BIF_NEWDIALOGSTYLE | \ - BIF_BROWSEINCLUDEFILES) - -static void FillTreeView(browse_info*, IShellFolder*, - LPITEMIDLIST, HTREEITEM, IEnumIDList*); -static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder*, - LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); - -static const WCHAR szBrowseFolderInfo[] = L"__WINE_BRSFOLDERDLG_INFO"; - -static DWORD __inline BrowseFlagsToSHCONTF(UINT ulFlags) -{ - return SHCONTF_FOLDERS | (ulFlags & BIF_BROWSEINCLUDEFILES ? SHCONTF_NONFOLDERS : 0); -} - -static void browsefolder_callback( LPBROWSEINFOW lpBrowseInfo, HWND hWnd, - UINT msg, LPARAM param ) -{ - if (!lpBrowseInfo->lpfn) - return; - lpBrowseInfo->lpfn( hWnd, msg, param, lpBrowseInfo->lParam ); -} - -static LAYOUT_DATA *LayoutInit(HWND hwnd, const LAYOUT_INFO *layout_info, int layout_count) -{ - LAYOUT_DATA *data; - RECT rcWnd; - int i; - - GetClientRect(hwnd, &rcWnd); - data = (LAYOUT_DATA *)SHAlloc(sizeof(LAYOUT_DATA)*layout_count); - for (i = 0; i < layout_count; i++) - { - RECT r; - HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId); - - if (hItem == NULL) - ERR("Item %d not found\n", i); - GetWindowRect(hItem, &r); - MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2); - - data[i].left = r.left; - data[i].right = rcWnd.right - r.right; - data[i].width = r.right - r.left; - - data[i].top = r.top; - data[i].bottom = rcWnd.bottom - r.bottom; - data[i].height = r.bottom - r.top; - } - return data; -} - -static void LayoutUpdate(HWND hwnd, LAYOUT_DATA *data, const LAYOUT_INFO *layout_info, int layout_count) -{ - RECT rcWnd; - int i; - - GetClientRect(hwnd, &rcWnd); - for (i = 0; i < layout_count; i++) - { - RECT r; - HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId); - - GetWindowRect(hItem, &r); - MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2); - - if (layout_info[i].dwAnchor & BF_RIGHT) - { - r.right = rcWnd.right - data[i].right; - if (!(layout_info[i].dwAnchor & BF_LEFT)) - r.left = r.right - data[i].width; - } - - if (layout_info[i].dwAnchor & BF_BOTTOM) - { - r.bottom = rcWnd.bottom - data[i].bottom; - if (!(layout_info[i].dwAnchor & BF_TOP)) - r.top = r.bottom - data[i].height; - } - - SetWindowPos(hItem, NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER); - } -} - - -/****************************************************************************** - * InitializeTreeView [Internal] - * - * Called from WM_INITDIALOG handler. - * - * PARAMS - * hwndParent [I] The BrowseForFolder dialog - * root [I] ITEMIDLIST of the root shell folder - */ -static void InitializeTreeView( browse_info *info ) -{ - LPITEMIDLIST pidlParent, pidlChild; - HIMAGELIST hImageList; - HRESULT hr; - CComPtr<IShellFolder> lpsfParent; - CComPtr<IShellFolder> lpsfRoot; - CComPtr<IEnumIDList> pEnumChildren; - HTREEITEM item; - DWORD flags; - LPCITEMIDLIST root = info->lpBrowseInfo->pidlRoot; - - TRACE("%p\n", info ); - - Shell_GetImageLists(NULL, &hImageList); - - if (hImageList) - SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); - - /* We want to call InsertTreeViewItem down the code, in order to insert - * the root item of the treeview. Due to InsertTreeViewItem's signature, - * we need the following to do this: - * - * + An ITEMIDLIST corresponding to _the parent_ of root. - * + An ITEMIDLIST, which is a relative path from root's parent to root - * (containing a single SHITEMID). - * + An IShellFolder interface pointer of root's parent folder. - * - * If root is 'Desktop', then root's parent is also 'Desktop'. - */ - - pidlParent = ILClone(root); - ILRemoveLastID(pidlParent); - pidlChild = ILClone(ILFindLastID(root)); - - if (_ILIsDesktop(pidlParent)) - { - hr = SHGetDesktopFolder(&lpsfParent); - } else { - CComPtr<IShellFolder> lpsfDesktop; - hr = SHGetDesktopFolder(&lpsfDesktop); - if (FAILED(hr)) { - WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); - ILFree(pidlChild); - ILFree(pidlParent); - return; - } - hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_PPV_ARG(IShellFolder, &lpsfParent)); - } - - if (FAILED(hr)) { - WARN("Could not bind to parent shell folder! hr = %08x\n", hr); - ILFree(pidlChild); - ILFree(pidlParent); - return; - } - - if (pidlChild && pidlChild->mkid.cb) { - hr = lpsfParent->BindToObject(pidlChild, 0, IID_PPV_ARG(IShellFolder, &lpsfRoot)); - } else { - lpsfRoot = lpsfParent; - } - - if (FAILED(hr)) { - WARN("Could not bind to root shell folder! hr = %08x\n", hr); - ILFree(pidlChild); - ILFree(pidlParent); - return; - } - - flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); - hr = lpsfRoot->EnumObjects(info->hWnd, flags, &pEnumChildren ); - if (FAILED(hr)) { - WARN("Could not get child iterator! hr = %08x\n", hr); - ILFree(pidlChild); - ILFree(pidlParent); - return; - } - - SendMessageW( info->hwndTreeView, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT ); - item = InsertTreeViewItem( info, lpsfParent, pidlChild, - pidlParent, pEnumChildren, TVI_ROOT ); - SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); - - ILFree(pidlChild); - ILFree(pidlParent); -} - -static int GetIcon(LPCITEMIDLIST lpi, UINT uFlags) -{ - SHFILEINFOW sfi; - SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), uFlags); - return sfi.iIcon; -} - -static void GetNormalAndSelectedIcons(LPITEMIDLIST lpifq, LPTVITEMW lpTV_ITEM) -{ - LPITEMIDLIST pidlDesktop = NULL; - DWORD flags; - - TRACE("%p %p\n",lpifq, lpTV_ITEM); - - if (!lpifq) - { - pidlDesktop = _ILCreateDesktop(); - lpifq = pidlDesktop; - } - - flags = SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON; - lpTV_ITEM->iImage = GetIcon( lpifq, flags ); - - flags = SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_OPENICON; - lpTV_ITEM->iSelectedImage = GetIcon( lpifq, flags ); - - if (pidlDesktop) - ILFree( pidlDesktop ); -} - -/****************************************************************************** - * GetName [Internal] - * - * Query a shell folder for the display name of one of it's children - * - * PARAMS - * lpsf [I] IShellFolder interface of the folder to be queried. - * lpi [I] ITEMIDLIST of the child, relative to parent - * dwFlags [I] as in IShellFolder::GetDisplayNameOf - * lpFriendlyName [O] The desired display name in unicode - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -static BOOL GetName(IShellFolder * lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR lpFriendlyName) -{ - BOOL bSuccess=TRUE; - STRRET str; - - TRACE("%p %p %x %p\n", lpsf, lpi, dwFlags, lpFriendlyName); - if (SUCCEEDED(lpsf->GetDisplayNameOf(lpi, dwFlags, &str))) - bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); - else - bSuccess = FALSE; - - TRACE("-- %s\n", debugstr_w(lpFriendlyName)); - return bSuccess; -} - -/****************************************************************************** - * InsertTreeViewItem [Internal] - * - * PARAMS - * info [I] data for the dialog - * lpsf [I] IShellFolder interface of the item's parent shell folder - * pidl [I] ITEMIDLIST of the child to insert, relative to parent - * pidlParent [I] ITEMIDLIST of the parent shell folder - * pEnumIL [I] Iterator for the children of the item to be inserted - * hParent [I] The treeview-item that represents the parent shell folder - * - * RETURNS - * Success: Handle to the created and inserted treeview-item - * Failure: NULL - */ -static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, - LPCITEMIDLIST pidl, LPCITEMIDLIST pidlParent, IEnumIDList* pEnumIL, - HTREEITEM hParent) -{ - TVITEMW tvi; - TVINSERTSTRUCTW tvins; - WCHAR szBuff[MAX_PATH]; - LPTV_ITEMDATA lptvid=0; - - tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM; - - tvi.cChildren= pEnumIL ? 1 : 0; - tvi.mask |= TVIF_CHILDREN; - - if (!GetName(lpsf, pidl, SHGDN_NORMAL, szBuff)) - return NULL; - - lptvid = (TV_ITEMDATA *)SHAlloc( sizeof(TV_ITEMDATA) ); - if (!lptvid) - return NULL; - - tvi.pszText = szBuff; - tvi.cchTextMax = MAX_PATH; - tvi.lParam = (LPARAM)lptvid; - - lpsf->AddRef(); - pEnumIL->AddRef(); - lptvid->lpsfParent = lpsf; - lptvid->lpi = ILClone(pidl); - lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl); - lptvid->pEnumIL = pEnumIL; - GetNormalAndSelectedIcons(lptvid->lpifq, &tvi); - - tvins.item = tvi; - tvins.hInsertAfter = NULL; - tvins.hParent = hParent; - - return TreeView_InsertItem( info->hwndTreeView, &tvins ); -} - -/****************************************************************************** - * FillTreeView [Internal] - * - * For each child (given by lpe) of the parent shell folder, which is given by - * lpsf and whose PIDL is pidl, insert a treeview-item right under hParent - * - * PARAMS - * info [I] data for the dialog - * lpsf [I] IShellFolder interface of the parent shell folder - * pidl [I] ITEMIDLIST of the parent shell folder - * hParent [I] The treeview item that represents the parent shell folder - * lpe [I] An iterator for the children of the parent shell folder - */ -static void FillTreeView( browse_info *info, IShellFolder * lpsf, - LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) -{ - LPITEMIDLIST pidlTemp = 0; - ULONG ulFetched; - HRESULT hr; - HWND hwnd = GetParent( info->hwndTreeView ); - - TRACE("%p %p %p %p\n",lpsf, pidl, hParent, lpe); - - /* No IEnumIDList -> No children */ - if (!lpe) return; - - SetCapture( hwnd ); - SetCursor( LoadCursorA( 0, (LPSTR)IDC_WAIT ) ); - - while (S_OK == lpe->Next(1,&pidlTemp,&ulFetched)) - { - ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; - CComPtr<IEnumIDList> pEnumIL; - CComPtr<IShellFolder> pSFChild; - lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); - if (ulAttrs & SFGAO_FOLDER) - { - hr = lpsf->BindToObject(pidlTemp, NULL, IID_PPV_ARG(IShellFolder, &pSFChild)); - if (SUCCEEDED(hr)) - { - DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); - hr = pSFChild->EnumObjects(hwnd, flags, &pEnumIL); - if (hr == S_OK) - { - if ((pEnumIL->Skip(1) != S_OK) || - FAILED(pEnumIL->Reset())) - { - pEnumIL = NULL; - } - } - } - } - - if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) - goto done; - SHFree(pidlTemp); /* Finally, free the pidl that the shell gave us... */ - pidlTemp=NULL; - } - -done: - ReleaseCapture(); - SetCursor(LoadCursorW(0, (LPWSTR)IDC_ARROW)); - SHFree(pidlTemp); -} - -static BOOL __inline PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type) -{ - LPPIDLDATA data = _ILGetDataPointer(pidl); - if (!data) - return FALSE; - return (data->type == type); -} - -static void BrsFolder_CheckValidSelection( browse_info *info, LPTV_ITEMDATA lptvid ) -{ - LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; - LPCITEMIDLIST pidl = lptvid->lpi; - BOOL bEnabled = TRUE; - DWORD dwAttributes; - HRESULT r; - - if ((lpBrowseInfo->ulFlags & BIF_BROWSEFORCOMPUTER) && - !PIDLIsType(pidl, PT_COMP)) - bEnabled = FALSE; - if (lpBrowseInfo->ulFlags & BIF_RETURNFSANCESTORS) - { - dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; - r = lptvid->lpsfParent->GetAttributesOf(1, - (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) - bEnabled = FALSE; - } - - dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; - r = lptvid->lpsfParent->GetAttributesOf(1, - (LPCITEMIDLIST*)&lptvid->lpi, - &dwAttributes); - if (FAILED(r) || - ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) - { - if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) - bEnabled = FALSE; - EnableWindow(GetDlgItem(info->hWnd, IDC_BROWSE_FOR_FOLDER_NEW_FOLDER), FALSE); - } - else - EnableWindow(GetDlgItem(info->hWnd, IDC_BROWSE_FOR_FOLDER_NEW_FOLDER), TRUE); - - SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, bEnabled); -} - -static LRESULT BrsFolder_Treeview_Delete( browse_info *info, NMTREEVIEWW *pnmtv ) -{ - LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA)pnmtv->itemOld.lParam; - - TRACE("TVN_DELETEITEMA/W %p\n", lptvid); - - lptvid->lpsfParent->Release(); - if (lptvid->pEnumIL) - lptvid->pEnumIL->Release(); - SHFree(lptvid->lpi); - SHFree(lptvid->lpifq); - SHFree(lptvid); - return 0; -} - -static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv ) -{ - CComPtr<IShellFolder> lpsf2; - LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - HRESULT r; - - TRACE("TVN_ITEMEXPANDINGA/W\n"); - - if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) - return 0; - - if (lptvid->lpi && lptvid->lpi->mkid.cb) { - r = lptvid->lpsfParent->BindToObject(lptvid->lpi, 0, IID_PPV_ARG(IShellFolder, &lpsf2)); - } else { - lpsf2 = lptvid->lpsfParent; - r = lpsf2->AddRef(); - } - - if (SUCCEEDED(r)) - { - FillTreeView( info, lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); - lpsf2->Release(); - } - - /* My Computer is already sorted and trying to do a simple text - * sort will only mess things up */ - if (!_ILIsMyComputer(lptvid->lpi)) - SendMessageW( info->hwndTreeView, TVM_SORTCHILDREN, - FALSE, (LPARAM)pnmtv->itemNew.hItem ); - - return 0; -} - -static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv ) -{ - LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - WCHAR name[MAX_PATH]; - - ILFree(info->pidlRet); - info->pidlRet = ILClone(lptvid->lpifq); - - if (GetName(lptvid->lpsfParent, lptvid->lpi, SHGDN_NORMAL, name)) - SetWindowTextW( GetDlgItem(info->hWnd, IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT), name ); - - browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, - (LPARAM)info->pidlRet ); - BrsFolder_CheckValidSelection( info, lptvid ); - return 0; -} - -static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) -{ - LPTV_ITEMDATA item_data; - WCHAR old_path[MAX_PATH], new_path[MAX_PATH], *p; - NMTREEVIEWW nmtv; - TVITEMW item; - - if(!pnmtv->item.pszText) - return 0; - - item.mask = TVIF_HANDLE|TVIF_PARAM; - item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); - SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); - item_data = (LPTV_ITEMDATA)item.lParam; - - SHGetPathFromIDListW(item_data->lpifq, old_path); - if(!(p = strrchrW(old_path, '\\'))) - return 0; - p = new_path+(p-old_path+1); - memcpy(new_path, old_path, (p-new_path)*sizeof(WCHAR)); - strcpyW(p, pnmtv->item.pszText); - - if(!MoveFileW(old_path, new_path)) - return 0; - - SHFree(item_data->lpifq); - SHFree(item_data->lpi); - item_data->lpifq = SHSimpleIDListFromPathW(new_path); - item_data->lpsfParent->ParseDisplayName(NULL, NULL, pnmtv->item.pszText, - NULL, &item_data->lpi, NULL); - - item.mask = TVIF_HANDLE|TVIF_TEXT; - item.pszText = pnmtv->item.pszText; - SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); - - nmtv.itemNew.lParam = item.lParam; - BrsFolder_Treeview_Changed(info, &nmtv); - return 0; -} - -static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh ) -{ - NMTREEVIEWW *pnmtv = (NMTREEVIEWW *)lpnmh; - - TRACE("%p %x %p msg=%x\n", info, CtlID, lpnmh, pnmtv->hdr.code); - - if (pnmtv->hdr.idFrom != IDC_BROWSE_FOR_FOLDER_TREEVIEW) - return 0; - - switch (pnmtv->hdr.code) - { - case TVN_DELETEITEMA: - case TVN_DELETEITEMW: - return BrsFolder_Treeview_Delete( info, pnmtv ); - - case TVN_ITEMEXPANDINGA: - case TVN_ITEMEXPANDINGW: - return BrsFolder_Treeview_Expand( info, pnmtv ); - - case TVN_SELCHANGEDA: - case TVN_SELCHANGEDW: - return BrsFolder_Treeview_Changed( info, pnmtv ); - - case TVN_ENDLABELEDITA: - case TVN_ENDLABELEDITW: - return BrsFolder_Treeview_Rename( info, (LPNMTVDISPINFOW)pnmtv ); - - default: - WARN("unhandled (%d)\n", pnmtv->hdr.code); - break; - } - - return 0; -} - - -static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) -{ - LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; - - info->hWnd = hWnd; - SetPropW( hWnd, szBrowseFolderInfo, info ); - - if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) - FIXME("flags BIF_NEWDIALOGSTYLE partially implemented\n"); - if (lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS) - FIXME("flags %x not implemented\n", lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS); - - if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) - { - RECT rcWnd; - - info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); - - /* TODO: Windows allows shrinking the windows a bit */ - GetWindowRect(hWnd, &rcWnd); - info->szMin.cx = rcWnd.right - rcWnd.left; - info->szMin.cy = rcWnd.bottom - rcWnd.top; - } - else - { - info->layout = NULL; - } - - if (lpBrowseInfo->lpszTitle) - SetWindowTextW( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_TITLE), lpBrowseInfo->lpszTitle ); - else - ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_TITLE), SW_HIDE ); - - if (!(lpBrowseInfo->ulFlags & BIF_STATUSTEXT) - || (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) - ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_STATUS), SW_HIDE ); - - /* Hide "Make New Folder" Button? */ - if ((lpBrowseInfo->ulFlags & BIF_NONEWFOLDERBUTTON) - || !(lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) - ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_NEW_FOLDER), SW_HIDE ); - - /* Hide the editbox? */ - if (!(lpBrowseInfo->ulFlags & BIF_EDITBOX)) - { - ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_FOLDER), SW_HIDE ); - ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT), SW_HIDE ); - } - - info->hwndTreeView = GetDlgItem( hWnd, IDC_BROWSE_FOR_FOLDER_TREEVIEW ); - if (info->hwndTreeView) - { - InitializeTreeView( info ); - - /* Resize the treeview if there's not editbox */ - if ((lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) - && !(lpBrowseInfo->ulFlags & BIF_EDITBOX)) - { - RECT rc; - GetClientRect(info->hwndTreeView, &rc); - SetWindowPos(info->hwndTreeView, HWND_TOP, 0, 0, - rc.right, rc.bottom + 40, SWP_NOMOVE); - } - } - else - ERR("treeview control missing!\n"); - - browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); - - return TRUE; -} - -static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) -{ - SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); - SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); - return S_OK; -} - -static HRESULT BrsFolder_NewFolder(browse_info *info) -{ - DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); - CComPtr<IShellFolder> desktop; - CComPtr<IShellFolder> cur; - CComPtr<ISFHelper> sfhelper; - WCHAR name[MAX_PATH]; - HTREEITEM parent, added; - LPTV_ITEMDATA item_data; - LPITEMIDLIST new_item; - TVITEMW item; - HRESULT hr; - int len; - - if(!info->pidlRet) { - ERR("Make new folder button should be disabled\n"); - return E_FAIL; - } - - /* Create new directory */ - hr = SHGetDesktopFolder(&desktop); - if(FAILED(hr)) - return hr; - hr = desktop->BindToObject(info->pidlRet, 0, IID_PPV_ARG(IShellFolder, &cur)); - if(FAILED(hr)) - return hr; - - hr = cur->QueryInterface(IID_PPV_ARG(ISFHelper, &sfhelper)); - if(FAILED(hr)) - return hr; - - hr = SHGetPathFromIDListW(info->pidlRet, name); - if(FAILED(hr)) - goto cleanup; - - len = strlenW(name); - if(len<MAX_PATH) - name[len++] = '\\'; - hr = sfhelper->GetUniqueName(&name[len], MAX_PATH-len); - if(FAILED(hr)) - goto cleanup; - - hr = E_FAIL; - if(!CreateDirectoryW(name, NULL)) - goto cleanup; - - /* Update parent of newly created directory */ - parent = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); - if(!parent) - goto cleanup; - - SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)parent); - - memset(&item, 0, sizeof(TVITEMW)); - item.mask = TVIF_PARAM|TVIF_STATE; - item.hItem = parent; - SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); - item_data = (LPTV_ITEMDATA)item.lParam; - if(!item_data) - goto cleanup; - - if(item_data->pEnumIL) - item_data->pEnumIL->Release(); - hr = cur->EnumObjects(info->hwndTreeView, flags, &item_data->pEnumIL); - if(FAILED(hr)) - goto cleanup; - - /* Update treeview */ - if(!(item.state&TVIS_EXPANDEDONCE)) { - item.mask = TVIF_STATE; - item.state = TVIS_EXPANDEDONCE; - item.stateMask = TVIS_EXPANDEDONCE; - SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); - } - - hr = cur->ParseDisplayName(NULL, NULL, name+len, NULL, &new_item, NULL); - if(FAILED(hr)) - goto cleanup; - - added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); - SHFree(new_item); - - SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); - return BrsFolder_Rename(info, added); - -cleanup: - return hr; -} - -static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) -{ - LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; - - switch (id) - { - case IDOK: - /* The original pidl is owned by the treeview and will be free'd. */ - info->pidlRet = ILClone(info->pidlRet); - if (info->pidlRet == NULL) /* A null pidl would mean a cancel */ - info->pidlRet = _ILCreateDesktop(); - pdump( info->pidlRet ); - if (lpBrowseInfo->pszDisplayName) - SHGetPathFromIDListW( info->pidlRet, lpBrowseInfo->pszDisplayName ); - EndDialog( info->hWnd, 1 ); - return TRUE; - - case IDCANCEL: - EndDialog( info->hWnd, 0 ); - return TRUE; - - case IDC_BROWSE_FOR_FOLDER_NEW_FOLDER: - BrsFolder_NewFolder(info); - return TRUE; - } - return FALSE; -} - -static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, - BOOL is_str, HTREEITEM *pItem) -{ - LPITEMIDLIST pidlSelection = (LPITEMIDLIST)selection; - LPCITEMIDLIST pidlCurrent, pidlRoot; - TVITEMEXW item; - BOOL bResult = FALSE; - - memset(&item, 0, sizeof(item)); - - /* If 'selection' is a string, convert to a Shell ID List. */ - if (is_str) { - CComPtr<IShellFolder> psfDesktop; - HRESULT hr; - - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - goto done; - - hr = psfDesktop->ParseDisplayName(NULL, NULL, (LPOLESTR)selection, - NULL, &pidlSelection, NULL); - if (FAILED(hr)) - goto done; - } - - /* Move pidlCurrent behind the SHITEMIDs in pidlSelection, which are the root of - * the sub-tree currently displayed. */ - pidlRoot = info->lpBrowseInfo->pidlRoot; - pidlCurrent = pidlSelection; - while (!_ILIsEmpty(pidlRoot) && _ILIsEqualSimple(pidlRoot, pidlCurrent)) { - pidlRoot = ILGetNext(pidlRoot); - pidlCurrent = ILGetNext(pidlCurrent); - } - - /* The given ID List is not part of the SHBrowseForFolder's current sub-tree. */ - if (!_ILIsEmpty(pidlRoot)) - goto done; - - /* Initialize item to point to the first child of the root folder. */ - item.mask = TVIF_PARAM; - item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_ROOT, 0); - - if (item.hItem) - item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, - (LPARAM)item.hItem); - - /* Walk the tree along the nodes corresponding to the remaining ITEMIDLIST */ - while (item.hItem && !_ILIsEmpty(pidlCurrent)) { - LPTV_ITEMDATA pItemData; - - SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); - pItemData = (LPTV_ITEMDATA)item.lParam; - - if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) { - pidlCurrent = ILGetNext(pidlCurrent); - if (!_ILIsEmpty(pidlCurrent)) { - /* Only expand current node and move on to it's first child, - * if we didn't already reach the last SHITEMID */ - SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); - item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, - (LPARAM)item.hItem); - } - } else { - item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_NEXT, - (LPARAM)item.hItem); - } - } - - if (_ILIsEmpty(pidlCurrent) && item.hItem) - bResult = TRUE; - -done: - if (pidlSelection && pidlSelection != (LPITEMIDLIST)selection) - ILFree(pidlSelection); - - if (pItem) - *pItem = item.hItem; - - return bResult; -} - -static BOOL BrsFolder_OnSetSelectionW(browse_info *info, LPVOID selection, BOOL is_str) { - HTREEITEM hItem; - BOOL bResult; - - if (!selection) return FALSE; - - bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); - if (bResult) - SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hItem ); - return bResult; -} - -static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL is_str) { - LPWSTR selectionW = NULL; - BOOL result = FALSE; - int length; - - if (!is_str) - return BrsFolder_OnSetSelectionW(info, selection, is_str); - - if ((length = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, NULL, 0)) && - (selectionW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) && - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, selectionW, length)) - { - result = BrsFolder_OnSetSelectionW(info, selectionW, is_str); - } - - HeapFree(GetProcessHeap(), 0, selectionW); - return result; -} - -static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) -{ - if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) - { - if (pos->cx < info->szMin.cx) - pos->cx = info->szMin.cx; - if (pos->cy < info->szMin.cy) - pos->cy = info->szMin.cy; - } - return 0; -} - -static INT BrsFolder_OnDestroy(browse_info *info) -{ - if (info->layout) - { - SHFree(info->layout); - info->layout = NULL; - } - - return 0; -} - -/************************************************************************* - * BrsFolderDlgProc32 (not an exported API function) - */ -static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, - LPARAM lParam ) -{ - browse_info *info; - - TRACE("hwnd=%p msg=%04x 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); - - if (msg == WM_INITDIALOG) - return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); - - info = (browse_info*) GetPropW( hWnd, szBrowseFolderInfo ); - - switch (msg) - { - case WM_NOTIFY: - return BrsFolder_OnNotify( info, (UINT)wParam, (LPNMHDR)lParam); - - case WM_COMMAND: - return BrsFolder_OnCommand( info, wParam ); - - case WM_WINDOWPOSCHANGING: - return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam); - - case WM_SIZE: - if (info->layout) /* new style dialogs */ - LayoutUpdate(hWnd, info->layout, g_layout_info, LAYOUT_INFO_COUNT); - return 0; - - case BFFM_SETSTATUSTEXTA: - TRACE("Set status %s\n", debugstr_a((LPSTR)lParam)); - SetWindowTextA(GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_STATUS), (LPSTR)lParam); - break; - - case BFFM_SETSTATUSTEXTW: - TRACE("Set status %s\n", debugstr_w((LPWSTR)lParam)); - SetWindowTextW(GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_STATUS), (LPWSTR)lParam); - break; - - case BFFM_ENABLEOK: - TRACE("Enable %ld\n", lParam); - EnableWindow(GetDlgItem(hWnd, 1), (lParam)?TRUE:FALSE); - break; - - case BFFM_SETOKTEXT: /* unicode only */ - TRACE("Set OK text %s\n", debugstr_w((LPWSTR)wParam)); - SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)wParam); - break; - - case BFFM_SETSELECTIONA: - return BrsFolder_OnSetSelectionA(info, (LPVOID)lParam, (BOOL)wParam); - - case BFFM_SETSELECTIONW: - return BrsFolder_OnSetSelectionW(info, (LPVOID)lParam, (BOOL)wParam); - - case BFFM_SETEXPANDED: /* unicode only */ - return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); - - case WM_DESTROY: - return BrsFolder_OnDestroy(info); - } - return FALSE; -} - - - - -/************************************************************************* - * SHBrowseForFolderA [SHELL32.@] - * SHBrowseForFolder [SHELL32.@] - */ -LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi) -{ - BROWSEINFOW bi; - LPITEMIDLIST lpid; - INT len; - LPWSTR title; - - TRACE("%p\n", lpbi); - - bi.hwndOwner = lpbi->hwndOwner; - bi.pidlRoot = lpbi->pidlRoot; - if (lpbi->pszDisplayName) - { - bi.pszDisplayName = (WCHAR *)HeapAlloc( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH ); - } - else - bi.pszDisplayName = NULL; - - if (lpbi->lpszTitle) - { - len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); - title = (WCHAR *)HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len ); - } - else - title = NULL; - - bi.lpszTitle = title; - bi.ulFlags = lpbi->ulFlags; - bi.lpfn = lpbi->lpfn; - bi.lParam = lpbi->lParam; - bi.iImage = lpbi->iImage; - lpid = SHBrowseForFolderW( &bi ); - if (bi.pszDisplayName) - { - WideCharToMultiByte( CP_ACP, 0, bi.pszDisplayName, -1, - lpbi->pszDisplayName, MAX_PATH, 0, NULL); - HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); - } - HeapFree(GetProcessHeap(), 0, title); - lpbi->iImage = bi.iImage; - return lpid; -} - - -/************************************************************************* - * SHBrowseForFolderW [SHELL32.@] - * - * NOTES - * crashes when passed a null pointer - */ -LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) -{ - browse_info info; - DWORD r; - HRESULT hr; - WORD wDlgId; - - info.hWnd = 0; - info.pidlRet = NULL; - info.lpBrowseInfo = lpbi; - info.hwndTreeView = NULL; - - hr = OleInitialize(NULL); - - if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE) - wDlgId = IDD_BROWSE_FOR_FOLDER_NEW; - else - wDlgId = IDD_BROWSE_FOR_FOLDER; - r = DialogBoxParamW( shell32_hInstance, MAKEINTRESOURCEW(wDlgId), lpbi->hwndOwner, - BrsFolderDlgProc, (LPARAM)&info ); - if (SUCCEEDED(hr)) - OleUninitialize(); - if (!r) - { - ILFree(info.pidlRet); - return NULL; - } - - return info.pidlRet; -} Copied: branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c (from r65246, branches/shell-experiments/dll/win32/shell32/brsfolder.cpp) URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Tue Nov 4 20:10:43 2014 @@ -23,7 +23,24 @@ * - implement new dialog style resizing */ -#include "precomp.h" +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <shlobj.h> +#include <undocshell.h> +#include <shellapi.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "pidl.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -88,7 +105,7 @@ static const WCHAR szBrowseFolderInfo[] = L"__WINE_BRSFOLDERDLG_INFO"; -static DWORD __inline BrowseFlagsToSHCONTF(UINT ulFlags) +static inline DWORD BrowseFlagsToSHCONTF(UINT ulFlags) { return SHCONTF_FOLDERS | (ulFlags & BIF_BROWSEINCLUDEFILES ? SHCONTF_NONFOLDERS : 0); } @@ -177,9 +194,8 @@ LPITEMIDLIST pidlParent, pidlChild; HIMAGELIST hImageList; HRESULT hr; - CComPtr<IShellFolder> lpsfParent; - CComPtr<IShellFolder> lpsfRoot; - CComPtr<IEnumIDList> pEnumChildren; + IShellFolder *lpsfParent, *lpsfRoot; + IEnumIDList * pEnumChildren; HTREEITEM item; DWORD flags; LPCITEMIDLIST root = info->lpBrowseInfo->pidlRoot; @@ -211,7 +227,7 @@ { hr = SHGetDesktopFolder(&lpsfParent); } else { - CComPtr<IShellFolder> lpsfDesktop; + IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); @@ -219,7 +235,7 @@ ILFree(pidlParent); return; } - hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_PPV_ARG(IShellFolder, &lpsfParent)); + hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); } if (FAILED(hr)) { @@ -230,7 +246,7 @@ } if (pidlChild && pidlChild->mkid.cb) { - hr = lpsfParent->BindToObject(pidlChild, 0, IID_PPV_ARG(IShellFolder, &lpsfRoot)); + hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); } else { lpsfRoot = lpsfParent; } @@ -243,7 +259,7 @@ } flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); - hr = lpsfRoot->EnumObjects(info->hWnd, flags, &pEnumChildren ); + hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); if (FAILED(hr)) { WARN("Could not get child iterator! hr = %08x\n", hr); ILFree(pidlChild); @@ -311,7 +327,7 @@ STRRET str; TRACE("%p %p %x %p\n", lpsf, lpi, dwFlags, lpFriendlyName); - if (SUCCEEDED(lpsf->GetDisplayNameOf(lpi, dwFlags, &str))) + if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str))) bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); else bSuccess = FALSE; @@ -360,15 +376,15 @@ tvi.cchTextMax = MAX_PATH; tvi.lParam = (LPARAM)lptvid; - lpsf->AddRef(); - pEnumIL->AddRef(); + IShellFolder_AddRef(lpsf); + IEnumIDList_AddRef(pEnumIL); lptvid->lpsfParent = lpsf; lptvid->lpi = ILClone(pidl); lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl); lptvid->pEnumIL = pEnumIL; GetNormalAndSelectedIcons(lptvid->lpifq, &tvi); - tvins.item = tvi; + tvins.u.item = tvi; tvins.hInsertAfter = NULL; tvins.hParent = hParent; @@ -404,23 +420,23 @@ SetCapture( hwnd ); SetCursor( LoadCursorA( 0, (LPSTR)IDC_WAIT ) ); - while (S_OK == lpe->Next(1,&pidlTemp,&ulFetched)) + while (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)) { ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; - CComPtr<IEnumIDList> pEnumIL; - CComPtr<IShellFolder> pSFChild; - lpsf->GetAttributesOf(1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); + IEnumIDList* pEnumIL; + IShellFolder* pSFChild; + IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulAttrs); if (ulAttrs & SFGAO_FOLDER) { - hr = lpsf->BindToObject(pidlTemp, NULL, IID_PPV_ARG(IShellFolder, &pSFChild)); + hr = IShellFolder_BindToObject(lpsf,pidlTemp,NULL,&IID_IShellFolder,(LPVOID*)&pSFChild); if (SUCCEEDED(hr)) { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); - hr = pSFChild->EnumObjects(hwnd, flags, &pEnumIL); + hr = IShellFolder_EnumObjects(pSFChild, hwnd, flags, &pEnumIL); if (hr == S_OK) { - if ((pEnumIL->Skip(1) != S_OK) || - FAILED(pEnumIL->Reset())) + if ((IEnumIDList_Skip(pEnumIL, 1) != S_OK) || + FAILED(IEnumIDList_Reset(pEnumIL))) { pEnumIL = NULL; } @@ -440,7 +456,7 @@ SHFree(pidlTemp); } -static BOOL __inline PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type) +static inline BOOL PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type) { LPPIDLDATA data = _ILGetDataPointer(pidl); if (!data) @@ -462,16 +478,17 @@ if (lpBrowseInfo->ulFlags & BIF_RETURNFSANCESTORS) { dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; - r = lptvid->lpsfParent->GetAttributesOf(1, + r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; - r = lptvid->lpsfParent->GetAttributesOf(1, - (LPCITEMIDLIST*)&lptvid->lpi, - &dwAttributes); + r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, + 1, + (LPCITEMIDLIST*)&lptvid->lpi, + &dwAttributes); if (FAILED(r) || ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) { @@ -491,9 +508,9 @@ TRACE("TVN_DELETEITEMA/W %p\n", lptvid); - lptvid->lpsfParent->Release(); + IShellFolder_Release(lptvid->lpsfParent); if (lptvid->pEnumIL) - lptvid->pEnumIL->Release(); + IEnumIDList_Release(lptvid->pEnumIL); SHFree(lptvid->lpi); SHFree(lptvid->lpifq); SHFree(lptvid); @@ -502,7 +519,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv ) { - CComPtr<IShellFolder> lpsf2; + IShellFolder *lpsf2; LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; HRESULT r; @@ -512,16 +529,16 @@ return 0; if (lptvid->lpi && lptvid->lpi->mkid.cb) { - r = lptvid->lpsfParent->BindToObject(lptvid->lpi, 0, IID_PPV_ARG(IShellFolder, &lpsf2)); + r = IShellFolder_BindToObject(lptvid->lpsfParent, lptvid->lpi, 0, &IID_IShellFolder, (void**)&lpsf2); } else { lpsf2 = lptvid->lpsfParent; - r = lpsf2->AddRef(); + r = IShellFolder_AddRef(lpsf2); } if (SUCCEEDED(r)) { FillTreeView( info, lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); - lpsf2->Release(); + IShellFolder_Release( lpsf2 ); } /* My Computer is already sorted and trying to do a simple text @@ -578,8 +595,8 @@ SHFree(item_data->lpifq); SHFree(item_data->lpi); item_data->lpifq = SHSimpleIDListFromPathW(new_path); - item_data->lpsfParent->ParseDisplayName(NULL, NULL, pnmtv->item.pszText, - NULL, &item_data->lpi, NULL); + IShellFolder_ParseDisplayName(item_data->lpsfParent, NULL, NULL, pnmtv->item.pszText, + NULL, &item_data->lpi, NULL); item.mask = TVIF_HANDLE|TVIF_TEXT; item.pszText = pnmtv->item.pszText; @@ -708,9 +725,8 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); - CComPtr<IShellFolder> desktop; - CComPtr<IShellFolder> cur; - CComPtr<ISFHelper> sfhelper; + IShellFolder *desktop, *cur; + ISFHelper *sfhelper; WCHAR name[MAX_PATH]; HTREEITEM parent, added; LPTV_ITEMDATA item_data; @@ -728,11 +744,11 @@ hr = SHGetDesktopFolder(&desktop); if(FAILED(hr)) return hr; - hr = desktop->BindToObject(info->pidlRet, 0, IID_PPV_ARG(IShellFolder, &cur)); + hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur); if(FAILED(hr)) return hr; - hr = cur->QueryInterface(IID_PPV_ARG(ISFHelper, &sfhelper)); + hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper); if(FAILED(hr)) return hr; @@ -743,7 +759,7 @@ len = strlenW(name); if(len<MAX_PATH) name[len++] = '\\'; - hr = sfhelper->GetUniqueName(&name[len], MAX_PATH-len); + hr = ISFHelper_GetUniqueName(sfhelper, &name[len], MAX_PATH-len); if(FAILED(hr)) goto cleanup; @@ -767,8 +783,8 @@ goto cleanup; if(item_data->pEnumIL) - item_data->pEnumIL->Release(); - hr = cur->EnumObjects(info->hwndTreeView, flags, &item_data->pEnumIL); + IEnumIDList_Release(item_data->pEnumIL); + hr = IShellFolder_EnumObjects(cur, info->hwndTreeView, flags, &item_data->pEnumIL); if(FAILED(hr)) goto cleanup; @@ -780,7 +796,7 @@ SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); } - hr = cur->ParseDisplayName(NULL, NULL, name+len, NULL, &new_item, NULL); + hr = IShellFolder_ParseDisplayName(cur, NULL, NULL, name+len, NULL, &new_item, NULL); if(FAILED(hr)) goto cleanup; @@ -834,15 +850,15 @@ /* If 'selection' is a string, convert to a Shell ID List. */ if (is_str) { - CComPtr<IShellFolder> psfDesktop; + IShellFolder *psfDesktop; HRESULT hr; hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) goto done; - hr = psfDesktop->ParseDisplayName(NULL, NULL, (LPOLESTR)selection, - NULL, &pidlSelection, NULL); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPOLESTR)selection, + NULL, &pidlSelection, NULL); if (FAILED(hr)) goto done; }

1 0

[akhaldi] 65249: [SHELL32] * bool => BOOL.
by akhaldi＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: akhaldi Date: Tue Nov 4 20:00:09 2014 New Revision: 65249 URL: http://svn.reactos.org/svn/reactos?rev=65249&view=rev Log: [SHELL32] * bool => BOOL. Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h branches/shell-experiments/dll/win32/shell32/shellfolder.h Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -1189,7 +1189,7 @@ return ret; } -HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy) +HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy) { CComPtr<IPersistFolder2> ppf2; WCHAR szSrcPath[MAX_PATH]; Modified: branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -88,7 +88,7 @@ virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy); + virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); DECLARE_REGISTRY_RESOURCEID(IDR_SHELLDESKTOP) DECLARE_NOT_AGGREGATABLE(CDesktopFolder) Modified: branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -1030,7 +1030,7 @@ * copies items to this folder */ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl, - LPCITEMIDLIST * apidl, bool bCopy) + LPCITEMIDLIST * apidl, BOOL bCopy) { CComPtr<IPersistFolder2> ppf2 = NULL; WCHAR szSrcPath[MAX_PATH]; Modified: branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -102,7 +102,7 @@ virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, bool bCopy); + virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) Modified: branches/shell-experiments/dll/win32/shell32/shellfolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellfolder.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellfolder.h [iso-8859-1] Tue Nov 4 20:00:09 2014 @@ -42,7 +42,7 @@ STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; - STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, bool bCopy) PURE; + STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) PURE; }; #undef INTERFACE

1 0

[tfaber] 65248: [NTOS:SE] - Simplify SeSetSecurityDescriptorInfoEx - Don't dereference an object that was never referenced
by tfaber＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tfaber Date: Tue Nov 4 18:47:13 2014 New Revision: 65248 URL: http://svn.reactos.org/svn/reactos?rev=65248&view=rev Log: [NTOS:SE] - Simplify SeSetSecurityDescriptorInfoEx - Don't dereference an object that was never referenced Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=65248… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Nov 4 18:47:13 2014 @@ -634,7 +634,7 @@ ULONG GroupLength = 0; ULONG DaclLength = 0; ULONG SaclLength = 0; - ULONG Control = 0; + SECURITY_DESCRIPTOR_CONTROL Control = 0; ULONG_PTR Current; ULONG SdLength; @@ -711,7 +711,7 @@ /* Build the new security descrtiptor */ RtlCreateSecurityDescriptorRelative(RelSD, SECURITY_DESCRIPTOR_REVISION); - RelSD->Control = (USHORT)Control; + RelSD->Control = Control; Current = (ULONG_PTR)(RelSD + 1); @@ -826,16 +826,15 @@ PISECURITY_DESCRIPTOR_RELATIVE ObjectSd; PISECURITY_DESCRIPTOR_RELATIVE NewSd; PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; - PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; - PSID Owner = 0; - PSID Group = 0; - PACL Dacl = 0; - PACL Sacl = 0; - ULONG OwnerLength = 0; - ULONG GroupLength = 0; - ULONG DaclLength = 0; - ULONG SaclLength = 0; - ULONG Control = 0; + PSID Owner; + PSID Group; + PACL Dacl; + PACL Sacl; + ULONG OwnerLength; + ULONG GroupLength; + ULONG DaclLength; + ULONG SaclLength; + SECURITY_DESCRIPTOR_CONTROL Control = 0; ULONG Current; SECURITY_INFORMATION SecurityInformation; @@ -854,116 +853,62 @@ /* Get owner and owner size */ if (SecurityInformation & OWNER_SECURITY_INFORMATION) { - if (SecurityDescriptor->Owner != NULL) - { - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - Owner = (PSID)((ULONG_PTR)RelSD->Owner + - (ULONG_PTR)SecurityDescriptor); - else - Owner = (PSID)SecurityDescriptor->Owner; - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - + Owner = SepGetOwnerFromDescriptor(SecurityDescriptor); Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); } else { - if (ObjectSd->Owner) - { - Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - + Owner = SepGetOwnerFromDescriptor(ObjectSd); Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); } + OwnerLength = Owner ? RtlLengthSid(Owner) : 0; + NT_ASSERT(OwnerLength % sizeof(ULONG) == 0); /* Get group and group size */ if (SecurityInformation & GROUP_SECURITY_INFORMATION) { - if (SecurityDescriptor->Group != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + - (ULONG_PTR)SecurityDescriptor); - else - Group = (PSID)SecurityDescriptor->Group; - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - + Group = SepGetGroupFromDescriptor(SecurityDescriptor); Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); } else { - if (ObjectSd->Group) - { - Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - + Group = SepGetGroupFromDescriptor(ObjectSd); Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); } + GroupLength = Group ? RtlLengthSid(Group) : 0; + NT_ASSERT(GroupLength % sizeof(ULONG) == 0); /* Get DACL and DACL size */ if (SecurityInformation & DACL_SECURITY_INFORMATION) { - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - (SecurityDescriptor->Dacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + - (ULONG_PTR)SecurityDescriptor); - else - Dacl = (PACL)SecurityDescriptor->Dacl; - - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - + Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); } else { - if ((ObjectSd->Control & SE_DACL_PRESENT) && (ObjectSd->Dacl)) - { - Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - + Dacl = SepGetDaclFromDescriptor(ObjectSd); Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); } + DaclLength = Dacl ? ROUND_UP((ULONG)Dacl->AclSize, 4) : 0; /* Get SACL and SACL size */ if (SecurityInformation & SACL_SECURITY_INFORMATION) { - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - (SecurityDescriptor->Sacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + - (ULONG_PTR)SecurityDescriptor); - else - Sacl = (PACL)SecurityDescriptor->Sacl; - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - + Sacl = SepGetSaclFromDescriptor(SecurityDescriptor); Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); } else { - if ((ObjectSd->Control & SE_SACL_PRESENT) && (ObjectSd->Sacl)) - { - Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - + Sacl = SepGetSaclFromDescriptor(ObjectSd); Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); } + SaclLength = Sacl ? ROUND_UP((ULONG)Sacl->AclSize, 4) : 0; NewSd = ExAllocatePool(NonPagedPool, sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + DaclLength + SaclLength); if (NewSd == NULL) { - ObDereferenceObject(Object); return STATUS_INSUFFICIENT_RESOURCES; } @@ -971,7 +916,7 @@ SECURITY_DESCRIPTOR_REVISION1); /* We always build a self-relative descriptor */ - NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; + NewSd->Control = Control | SE_SELF_RELATIVE; Current = sizeof(SECURITY_DESCRIPTOR);

1 0

[tfaber] 65247: [NTOS:SE] - Call SeSetSecurityDescriptorInfoEx from SeSetSecurityDescriptorInfo
by tfaber＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: tfaber Date: Tue Nov 4 18:40:24 2014 New Revision: 65247 URL: http://svn.reactos.org/svn/reactos?rev=65247&view=rev Log: [NTOS:SE] - Call SeSetSecurityDescriptorInfoEx from SeSetSecurityDescriptorInfo Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=65247… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Nov 4 18:40:24 2014 @@ -615,11 +615,14 @@ /* * @implemented */ -NTSTATUS NTAPI -SeQuerySecurityDescriptorInfo(IN PSECURITY_INFORMATION SecurityInformation, - IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PULONG Length, - IN PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor OPTIONAL) +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTAPI +SeQuerySecurityDescriptorInfo( + _In_ PSECURITY_INFORMATION SecurityInformation, + _Out_writes_bytes_(*Length) PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PULONG Length, + _Inout_ PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor) { PISECURITY_DESCRIPTOR ObjectSd; PISECURITY_DESCRIPTOR_RELATIVE RelSD; @@ -635,6 +638,8 @@ ULONG_PTR Current; ULONG SdLength; + PAGED_CODE(); + RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; if (*ObjectsSecurityDescriptor == NULL) @@ -781,13 +786,42 @@ /* * @implemented */ -NTSTATUS NTAPI -SeSetSecurityDescriptorInfo(IN PVOID Object OPTIONAL, - IN PSECURITY_INFORMATION _SecurityInformation, - IN PSECURITY_DESCRIPTOR _SecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, - IN POOL_TYPE PoolType, - IN PGENERIC_MAPPING GenericMapping) +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTAPI +SeSetSecurityDescriptorInfo( + _In_opt_ PVOID Object, + _In_ PSECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping) +{ + PAGED_CODE(); + + return SeSetSecurityDescriptorInfoEx(Object, + SecurityInformation, + SecurityDescriptor, + ObjectsSecurityDescriptor, + 0, + PoolType, + GenericMapping); +} + +/* + * @implemented + */ +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTAPI +SeSetSecurityDescriptorInfoEx( + _In_opt_ PVOID Object, + _In_ PSECURITY_INFORMATION _SecurityInformation, + _In_ PSECURITY_DESCRIPTOR _SecurityDescriptor, + _Inout_ PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + _In_ ULONG AutoInheritFlags, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping) { PISECURITY_DESCRIPTOR_RELATIVE ObjectSd; PISECURITY_DESCRIPTOR_RELATIVE NewSd; @@ -805,6 +839,8 @@ ULONG Current; SECURITY_INFORMATION SecurityInformation; + PAGED_CODE(); + ObjectSd = *ObjectsSecurityDescriptor; /* The object does not have a security descriptor. */ @@ -969,29 +1005,6 @@ *ObjectsSecurityDescriptor = NewSd; return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -SeSetSecurityDescriptorInfoEx(IN PVOID Object OPTIONAL, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR ModificationDescriptor, - IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, - IN ULONG AutoInheritFlags, - IN POOL_TYPE PoolType, - IN PGENERIC_MAPPING GenericMapping) -{ - PISECURITY_DESCRIPTOR ObjectSd = *ObjectsSecurityDescriptor; - - /* The object does not have a security descriptor. */ - if (!ObjectSd) - return STATUS_NO_SECURITY_ON_OBJECT; - - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; }

1 0

[gadamopoulos] 65246: [SHELL32] Rename cpp files to the name of the class they implement
by gadamopoulos＠svn.reactos.org 04 Nov '14

04 Nov '14

Author: gadamopoulos Date: Tue Nov 4 13:28:57 2014 New Revision: 65246 URL: http://svn.reactos.org/svn/reactos?rev=65246&view=rev Log: [SHELL32] Rename cpp files to the name of the class they implement Added: branches/shell-experiments/dll/win32/shell32/CAutoComplete.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/autocomplete.cpp branches/shell-experiments/dll/win32/shell32/CAutoComplete.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/autocomplete.h branches/shell-experiments/dll/win32/shell32/CDefView.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/dll/win32/shell32/CDefaultContextMenu.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/CDesktopBrowser.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/desktop.cpp branches/shell-experiments/dll/win32/shell32/CDropTargetHelper.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/dragdrophelper.cpp branches/shell-experiments/dll/win32/shell32/CDropTargetHelper.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/dragdrophelper.h branches/shell-experiments/dll/win32/shell32/CEnumIDListBase.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/enumidlist.cpp branches/shell-experiments/dll/win32/shell32/CEnumIDListBase.h - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/enumidlist.h branches/shell-experiments/dll/win32/shell32/CExtractIcon.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/extracticon.cpp branches/shell-experiments/dll/win32/shell32/CFileSysBindData.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp branches/shell-experiments/dll/win32/shell32/CIDLDataObj.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/dataobject.cpp branches/shell-experiments/dll/win32/shell32/CNewMenu.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/newmenu.cpp branches/shell-experiments/dll/win32/shell32/CNewMenu.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/newmenu.h branches/shell-experiments/dll/win32/shell32/COpenWithMenu.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/openwithmenu.cpp branches/shell-experiments/dll/win32/shell32/COpenWithMenu.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/openwithmenu.h branches/shell-experiments/dll/win32/shell32/CShellItem.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/shellitem.cpp branches/shell-experiments/dll/win32/shell32/CShellItem.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/shellitem.h branches/shell-experiments/dll/win32/shell32/CShellLink.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/CShellLink.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/shelllink.h branches/shell-experiments/dll/win32/shell32/CStartMenu.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/startmenu.cpp branches/shell-experiments/dll/win32/shell32/CStartMenu.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/startmenu.h branches/shell-experiments/dll/win32/shell32/folders/CAdminToolsFolder.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp branches/shell-experiments/dll/win32/shell32/folders/CAdminToolsFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/admintools.h branches/shell-experiments/dll/win32/shell32/folders/CControlPanelFolder.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp branches/shell-experiments/dll/win32/shell32/folders/CControlPanelFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/cpanel.h branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/CDesktopFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/desktop.h branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp branches/shell-experiments/dll/win32/shell32/folders/CDrivesFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/mycomp.h branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/CFSFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/fs.h branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shell32/folders/CFontsFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/fonts.h branches/shell-experiments/dll/win32/shell32/folders/CMyDocsFolder.cpp - copied unchanged from r65243, branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/CMyDocsFolder.h - copied unchanged from r65243, branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.cpp - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp branches/shell-experiments/dll/win32/shell32/folders/CNetFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/netplaces.h branches/shell-experiments/dll/win32/shell32/folders/CPrinterFolder.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/printers.cpp branches/shell-experiments/dll/win32/shell32/folders/CPrinterFolder.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/printers.h branches/shell-experiments/dll/win32/shell32/folders/CRecycleBin.cpp - copied unchanged from r65245, branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/folders/CRecycleBin.h - copied unchanged from r65236, branches/shell-experiments/dll/win32/shell32/folders/recyclebin.h Removed: branches/shell-experiments/dll/win32/shell32/autocomplete.cpp branches/shell-experiments/dll/win32/shell32/autocomplete.h branches/shell-experiments/dll/win32/shell32/dataobject.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/desktop.cpp branches/shell-experiments/dll/win32/shell32/dragdrophelper.cpp branches/shell-experiments/dll/win32/shell32/dragdrophelper.h branches/shell-experiments/dll/win32/shell32/enumidlist.cpp branches/shell-experiments/dll/win32/shell32/enumidlist.h branches/shell-experiments/dll/win32/shell32/extracticon.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.h branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp branches/shell-experiments/dll/win32/shell32/folders/cpanel.h branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.h branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shell32/folders/fonts.h branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/fs.h branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.h branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp branches/shell-experiments/dll/win32/shell32/folders/netplaces.h branches/shell-experiments/dll/win32/shell32/folders/printers.cpp branches/shell-experiments/dll/win32/shell32/folders/printers.h branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/folders/recyclebin.h branches/shell-experiments/dll/win32/shell32/newmenu.cpp branches/shell-experiments/dll/win32/shell32/newmenu.h branches/shell-experiments/dll/win32/shell32/openwithmenu.cpp branches/shell-experiments/dll/win32/shell32/openwithmenu.h branches/shell-experiments/dll/win32/shell32/shellitem.cpp branches/shell-experiments/dll/win32/shell32/shellitem.h branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/shelllink.h branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/dll/win32/shell32/startmenu.cpp branches/shell-experiments/dll/win32/shell32/startmenu.h Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt branches/shell-experiments/dll/win32/shell32/precomp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/autocomplete.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/dataobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/dragdrophelper.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/dragdrophelper.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/enumidlist.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/enumidlist.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/extracticon.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/newmenu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shellitem.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Removed: branches/shell-experiments/dll/win32/shell32/startmenu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she…

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014