Ros-diffs July 2014

ros-diffs@reactos.org

9 participants
111 discussions

[hbelusca] 63691: [SACDRV] ASSERT takes a condition, not a string. [NTOS] Use ASSERTMSG instead of a weird ASSERT construction.
by hbelusca＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: hbelusca Date: Sun Jul 6 11:23:22 2014 New Revision: 63691 URL: http://svn.reactos.org/svn/reactos?rev=63691&view=rev Log: [SACDRV] ASSERT takes a condition, not a string. [NTOS] Use ASSERTMSG instead of a weird ASSERT construction. Modified: trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… ============================================================================== --- trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] Sun Jul 6 11:23:22 2014 @@ -104,7 +104,8 @@ PSAC_MEMORY_ENTRY LocalDescriptor, NextDescriptor; ULONG GlobalSize, ActualSize; PVOID Buffer; - ASSERT("Tag != FREE_POOL_TAG"); + + ASSERT(Tag != FREE_POOL_TAG); SAC_DBG(SAC_DBG_MM, "Entering.\n"); /* Acquire the memory allocation lock and align the size request */ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Jul 6 11:23:22 2014 @@ -925,7 +925,7 @@ } /* You should not have made it this far */ - ASSERT(FALSE && "System is still up and running?!"); + ASSERTMSG("System is still up and running?!", FALSE); break; }

1 0

[hbelusca] 63690: [NTOS:PS] Remove that deprecated NtW32Call function that doesn't exist on windows since NT 4.0 SP3. Alex, do you want to keep its prototype in the NDK too?
by hbelusca＠svn.reactos.org 06 Jul '14

06 Jul '14

Author: hbelusca Date: Sun Jul 6 00:00:07 2014 New Revision: 63690 URL: http://svn.reactos.org/svn/reactos?rev=63690&view=rev Log: [NTOS:PS] Remove that deprecated NtW32Call function that doesn't exist on windows since NT 4.0 SP3. Alex, do you want to keep its prototype in the NDK too? Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Sun Jul 6 00:00:07 2014 @@ -125,58 +125,4 @@ KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; } -NTSTATUS -NTAPI -NtW32Call(IN ULONG RoutineIndex, - IN PVOID Argument, - IN ULONG ArgumentLength, - OUT PVOID* Result, - OUT PULONG ResultLength) -{ - PVOID RetResult; - ULONG RetResultLength; - NTSTATUS Status; - ASSERT(KeGetPreviousMode() != KernelMode); - - /* Enter SEH for probing */ - _SEH2_TRY - { - /* Probe arguments */ - ProbeForWritePointer(Result); - ProbeForWriteUlong(ResultLength); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - /* Call kernel function */ - Status = KeUserModeCallback(RoutineIndex, - Argument, - ArgumentLength, - &RetResult, - &RetResultLength); - if (NT_SUCCESS(Status)) - { - /* Enter SEH for write back */ - _SEH2_TRY - { - /* Return results to user mode */ - *Result = RetResult; - *ResultLength = RetResultLength; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Return the result */ - return Status; -} - /* EOF */

1 0

[tkreuzer] 63689: [PSEH/RTL/CRT] Some ARM related compilation fixes, plus remove a useless define
by tkreuzer＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: tkreuzer Date: Sat Jul 5 19:17:16 2014 New Revision: 63689 URL: http://svn.reactos.org/svn/reactos?rev=63689&view=rev Log: [PSEH/RTL/CRT] Some ARM related compilation fixes, plus remove a useless define Modified: trunk/reactos/lib/pseh/CMakeLists.txt trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/string/winesup.c Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Sat Jul 5 19:17:16 2014 @@ -33,6 +33,10 @@ list(APPEND ASM_SOURCE amd64/seh.s amd64/seh_prolog.s) + elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE + arm/seh_prolog.s) + list(APPEND SOURCE dummy.c) endif() list(APPEND SOURCE dummy.c) Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=63… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Sat Jul 5 19:17:16 2014 @@ -221,8 +221,14 @@ DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); DbgPrint("EFLAGS: %.8x\n", pc->EFlags); +#elif defined(_M_ARM) + DbgPrint("Pc: %lx Lr: %lx Sp: %lx Cpsr: %lx\n", pc->Pc, pc->Lr, pc->Sp, pc->Cpsr); + DbgPrint("R0: %lx R1: %lx R2: %lx R3: %lx\n", pc->R0, pc->R1, pc->R2, pc->R3); + DbgPrint("R4: %lx R5: %lx R6: %lx R7: %lx\n", pc->R4, pc->R5, pc->R6, pc->R7); + DbgPrint("R8: %lx R9: %lx R10: %lx R11: %lx\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %lx \n", pc->R12); #else -#warning Unknown architecture +#pragma message ("Unknown architecture") #endif } Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sat Jul 5 19:17:16 2014 @@ -12,6 +12,11 @@ list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_asm.s) if(NOT MSVC) list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s) + endif() +elseif(ARCH STREQUAL "arm") + list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) + if(NOT MSVC) + list(APPEND CHKSTK_SOURCE except/arm/chkstk_ms.s) endif() elseif(ARCH STREQUAL "powerpc") list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s) Modified: trunk/reactos/lib/sdk/crt/string/winesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/winesup… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/winesup.c [iso-8859-1] Sat Jul 5 19:17:16 2014 @@ -99,4 +99,3 @@ else _SET_NUMBER_(float); } } -#undef _SET_NUMBER_

1 0

[tkreuzer] 63688: [FREELDR] Add ARM files to build, avoid a redefinition in osloader.h, use new autogenerated ksarm.h in arm/boot.s
by tkreuzer＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: tkreuzer Date: Sat Jul 5 19:02:41 2014 New Revision: 63688 URL: http://svn.reactos.org/svn/reactos?rev=63688&view=rev Log: [FREELDR] Add ARM files to build, avoid a redefinition in osloader.h, use new autogenerated ksarm.h in arm/boot.s Modified: trunk/reactos/boot/armllb/inc/osloader.h trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Modified: trunk/reactos/boot/armllb/inc/osloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/osloader.h… ============================================================================== --- trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] Sat Jul 5 19:02:41 2014 @@ -8,13 +8,12 @@ // // OS Loader Main Routine -// +// typedef VOID (*POSLOADER_INIT)( IN PVOID BoardInit ); -#ifndef __REGISTRY_H // // Type of memory detected by LLB // @@ -36,7 +35,6 @@ ULONG Type; ULONG Reserved; } BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; -#endif // // Information sent from LLB to OS Loader Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jul 5 19:02:41 2014 @@ -53,7 +53,6 @@ fs/fs.c fs/iso.c fs/ntfs.c - fs/pxe.c inifile/ini_init.c inifile/inifile.c inifile/parse.c @@ -87,6 +86,7 @@ arch/i386/linux.S arch/i386/mb.S) list(APPEND FREELDR_COMMON_SOURCE + fs/pxe.c arch/i386/archmach.c arch/i386/custom.c arch/i386/drivemap.c @@ -130,6 +130,7 @@ arch/amd64/int386.S arch/amd64/pnpbios.S) list(APPEND FREELDR_COMMON_SOURCE + fs/pxe.c arch/i386/custom.c arch/i386/drivemap.c arch/i386/hardware.c @@ -149,6 +150,12 @@ arch/i386/pcrtc.c arch/i386/pcvideo.c arch/amd64/winldr.c) +elseif(ARCH STREQUAL "arm") + list(APPEND FREELDR_COMMON_ASM_SOURCE + arch/arm/boot.S) + list(APPEND FREELDR_COMMON_SOURCE + arch/arm/macharm.c + arch/arm/winldr.c) else() #TBD endif() Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] Sat Jul 5 19:02:41 2014 @@ -6,16 +6,18 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ - .title "ARM FreeLDR Entry Point" - .include "ntoskrnl/include/internal/arm/kxarm.h" - .include "ntoskrnl/include/internal/arm/ksarm.h" - .section .init +#include "ksarm.h" + + //.title "ARM FreeLDR Entry Point" + //.include "ntoskrnl/include/internal/arm/kxarm.h" + //.include "ntoskrnl/include/internal/arm/ksarm.h" + //.section .init NESTED_ENTRY _start PROLOG_END _start - + b ArmInit - + ENTRY_END _start L_ArmInit:

1 0

[tfaber] 63687: [USBEHCI] - Fix a type-limits warning - Remove unnecessary casts and asserts - Use NULL for pointer comparison - Fix IN vs OUT annotation
by tfaber＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: tfaber Date: Sat Jul 5 16:32:43 2014 New Revision: 63687 URL: http://svn.reactos.org/svn/reactos?rev=63687&view=rev Log: [USBEHCI] - Fix a type-limits warning - Remove unnecessary casts and asserts - Use NULL for pointer comparison - Fix IN vs OUT annotation Modified: trunk/reactos/drivers/usb/usbehci/interfaces.h trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] Sat Jul 5 16:32:43 2014 @@ -23,7 +23,7 @@ IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; \ \ STDMETHOD_(VOID, GetCommandRegister)( THIS_ \ - IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; + OUT struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; #define IMP_IUSBEHCIHARDWARE \ STDMETHODIMP_(VOID) SetAsyncListRegister( \ @@ -39,7 +39,7 @@ STDMETHODIMP_(VOID) SetCommandRegister( \ IN struct _EHCI_USBCMD_CONTENT *UsbCmd); \ STDMETHODIMP_(VOID) GetCommandRegister( \ - IN struct _EHCI_USBCMD_CONTENT *UsbCmd); + OUT struct _EHCI_USBCMD_CONTENT *UsbCmd); DECLARE_INTERFACE_(IEHCIHardwareDevice, IUSBHardwareDevice) { Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sat Jul 5 16:32:43 2014 @@ -376,6 +376,7 @@ { UCHAR IntervalIndex; + ASSERT(Interval != 0); if (Interval == 1) IntervalIndex = 1; else if (Interval == 2) @@ -392,11 +393,10 @@ IntervalIndex = 7; else if (Interval <= 128) IntervalIndex = 8; - else if (Interval <= 256) + else IntervalIndex = 9; - else - IntervalIndex = 10; - + + ASSERT(IntervalIndex < EHCI_INTERRUPT_ENTRIES_COUNT); return IntervalIndex; } @@ -746,8 +746,7 @@ // // get queue head structure // - QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - ASSERT(QueueHead); + QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // // sanity check @@ -822,8 +821,7 @@ // // get queue head structure // - QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - ASSERT(QueueHead); + QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // // sanity check Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sat Jul 5 16:32:43 2014 @@ -894,7 +894,7 @@ // QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - ASSERT(m_EndpointDescriptor == FALSE); + ASSERT(m_EndpointDescriptor == NULL); // // init setup descriptor

1 0

[tfaber] 63686: [USBEHCI] - Initialize the new queue head before inserting it into the asynchronous schedule list, and add a memory barrier to ensure this order. The list can be read by the host co...
by tfaber＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: tfaber Date: Sat Jul 5 15:30:22 2014 New Revision: 63686 URL: http://svn.reactos.org/svn/reactos?rev=63686&view=rev Log: [USBEHCI] - Initialize the new queue head before inserting it into the asynchronous schedule list, and add a memory barrier to ensure this order. The list can be read by the host controller at any time, so the new item must be valid when inserted. See EHCI spec section 4.8.1. Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sat Jul 5 15:30:22 2014 @@ -479,20 +479,22 @@ InsertTailList(&HeadQueueHead->LinkedQueueHeads, &NewQueueHead->LinkedQueueHeads); // + // Update HLP for NewQueueHead to point to next, which should be the HeadQueueHead + // + Entry = NewQueueHead->LinkedQueueHeads.Flink; + NextQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + //ASSERT(NextQueueHead == HeadQueueHead); + NewQueueHead->HorizontalLinkPointer = (NextQueueHead->PhysicalAddr | QH_TYPE_QH); + + _ReadWriteBarrier(); + + // // Update HLP for Previous QueueHead, which should be the last in list. // Entry = NewQueueHead->LinkedQueueHeads.Blink; LastQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); //ASSERT(LastQueueHead == HeadQueueHead); LastQueueHead->HorizontalLinkPointer = (NewQueueHead->PhysicalAddr | QH_TYPE_QH); - - // - // Update HLP for NewQueueHead to point to next, which should be the HeadQueueHead - // - Entry = NewQueueHead->LinkedQueueHeads.Flink; - NextQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - //ASSERT(NextQueueHead == HeadQueueHead); - NewQueueHead->HorizontalLinkPointer = (NextQueueHead->PhysicalAddr | QH_TYPE_QH); // // head queue head must be halted

1 0

[dquintana] 63685: [EXPLORER-NEW] * Revert debugging change that shouldn't have been commited. * Implement rudimentary tooltip support for tray icons. Does not yet work exactly like the windows doe...
by dquintana＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: dquintana Date: Sat Jul 5 02:13:37 2014 New Revision: 63685 URL: http://svn.reactos.org/svn/reactos?rev=63685&view=rev Log: [EXPLORER-NEW] * Revert debugging change that shouldn't have been commited. * Implement rudimentary tooltip support for tray icons. Does not yet work exactly like the windows does it. Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Jul 5 02:13:37 2014 @@ -139,7 +139,10 @@ notifyItem->IconIndex = tbbi.iImage = ImageList_AddIcon(This->SysIcons, iconData->hIcon); } - /* TODO: support NIF_TIP */ + if (iconData->uFlags & NIF_TIP) + { + StringCchCopy(notifyItem->iconData.szTip, _countof(notifyItem->iconData.szTip), iconData->szTip); + } if (iconData->uFlags & NIF_STATE) { @@ -353,7 +356,7 @@ if (!parent) return 0; - return SendMessage(parent, msg, wParam, lParam); + SendMessage(parent, msg, wParam, lParam); } return DefSubclassProc(hWnd, msg, wParam, lParam); @@ -362,13 +365,16 @@ static VOID SysPagerWnd_Create(IN OUT PSYS_PAGER_WND_DATA This) { - This->hWndToolbar = CreateWindowEx(0, + DWORD styles = + WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | + TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | + CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; + DWORD exStyles = WS_EX_TOOLWINDOW; + + This->hWndToolbar = CreateWindowEx(exStyles, TOOLBARCLASSNAME, NULL, - WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | - TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | - TBSTYLE_TRANSPARENT | - CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER, + styles, 0, 0, 0, @@ -425,7 +431,7 @@ PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; if (cpData->dwData == 1) { - SYS_PAGER_COPY_DATA data; + SYS_PAGER_COPY_DATA * data; NOTIFYICONDATA *iconData; HWND parentHWND; RECT windowRect; @@ -433,20 +439,14 @@ parentHWND = GetParent(parentHWND); GetClientRect(parentHWND, &windowRect); - ZeroMemory(&data, sizeof(data)); - CopyMemory( - &data, - (PSYS_PAGER_COPY_DATA) cpData->lpData, - cpData->cbData); - iconData = &data.nicon_data; - - switch (data.notify_code) + data = (PSYS_PAGER_COPY_DATA) cpData->lpData; + iconData = &data->nicon_data; + + switch (data->notify_code) { case NIM_ADD: { PPNOTIFY_ITEM NotifyPointer; - - DbgPrint("NotifyMessage received with NIM_ADD\n"); NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); @@ -459,8 +459,6 @@ case NIM_MODIFY: { PPNOTIFY_ITEM NotifyPointer; - - DbgPrint("NotifyMessage received with NIM_MODIFY\n"); NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); @@ -476,13 +474,11 @@ } case NIM_DELETE: { - DbgPrint("NotifyMessage received with NIM_DELETE\n"); - SysPagerWnd_RemoveButton(This, iconData); break; } default: - DbgPrint("NotifyMessage received with unknown code %d.\n", data.notify_code); + DbgPrint("NotifyMessage received with unknown code %d.\n", data->notify_code); break; } SendMessage(parentHWND, @@ -572,6 +568,35 @@ case WM_NCDESTROY: SysPagerWnd_NCDestroy(This); break; + + case WM_NOTIFY: + { + const NMHDR * nmh = (const NMHDR *) lParam; + if (nmh->code == TBN_GETINFOTIPW) + { + NMTBGETINFOTIP * nmtip = (NMTBGETINFOTIP *) lParam; + PPNOTIFY_ITEM ptr = SysPagerWnd_FindPPNotifyItemByIndex(This, nmtip->iItem); + if (ptr) + { + PNOTIFY_ITEM item = *ptr; + StringCchCopy(nmtip->pszText, nmtip->cchTextMax, item->iconData.szTip); + } + } + else if (nmh->code == NM_CUSTOMDRAW) + { + NMCUSTOMDRAW * cdraw = (NMCUSTOMDRAW *) lParam; + switch (cdraw->dwDrawStage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW; + + case CDDS_ITEMPREPAINT: + return TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOOFFSET | TBCDRF_NOMARK | TBCDRF_NOETCHEDEFFECT; + } + } + + break; + } case WM_SIZE: { Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Jul 5 02:13:37 2014 @@ -665,8 +665,6 @@ { RECT rcTray,rcWorkArea; - return; - /* If monitor has changed then fix the previous monitors work area */ if (This->PreviousMonitor != This->Monitor) { @@ -775,11 +773,10 @@ /* FIXME: Are there more flags? */ - //if (sr.Position > ABE_BOTTOM) - // This->Position = ABE_BOTTOM; - //else - // This->Position = sr.Position; - This->Position = ABE_LEFT; + if (sr.Position > ABE_BOTTOM) + This->Position = ABE_BOTTOM; + else + This->Position = sr.Position; /* Try to find out which monitor the tray window was located on last. Here we're only interested in the monitor screen that we think

1 0

[dquintana] 63684: [EXPLORER-NEW] * Fix a typo that broke tray notify icons. * Implement loading of Shell Service Objects. Works in win2003 but no idea if it works in ros since we don't have any SS...
by dquintana＠svn.reactos.org 05 Jul '14

05 Jul '14

Author: dquintana Date: Sat Jul 5 00:35:43 2014 New Revision: 63684 URL: http://svn.reactos.org/svn/reactos?rev=63684&view=rev Log: [EXPLORER-NEW] * Fix a typo that broke tray notify icons. * Implement loading of Shell Service Objects. Works in win2003 but no idea if it works in ros since we don't have any SSO implemented yet ;P Added: branches/shell-experiments/base/shell/explorer-new/shellservice.c (with props) Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sat Jul 5 00:35:43 2014 @@ -9,6 +9,7 @@ explorer.c rshell.c settings.c + shellservice.c startmnu.c startup.c taskband.c Added: branches/shell-experiments/base/shell/explorer-new/shellservice.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/shellservice.c (added) +++ branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] Sat Jul 5 00:35:43 2014 @@ -0,0 +1,125 @@ +/* +* ReactOS Explorer +* +* Copyright 2014 - David Quintana +* +* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "precomp.h" + +extern HRESULT InitShellServices(HDPA * phdpa); +extern HRESULT ShutdownShellServices(HDPA hdpa); + +static int CALLBACK InitializeAllCallback(void* pItem, void* pData) +{ + IOleCommandTarget * pOct = pItem; + HRESULT * phr = pData; + *phr = IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + return SUCCEEDED(*phr); +} + +static int CALLBACK ShutdownAllCallback(void* pItem, void* pData) +{ + IOleCommandTarget * pOct = pItem; + IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_SAVE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + return TRUE; +} + +static int CALLBACK DeleteAllEnumCallback(void* pItem, void* pData) +{ + IOleCommandTarget * pOct = pItem; + IUnknown_Release(pOct); + return TRUE; +} + +HRESULT InitShellServices(HDPA * phdpa) +{ + IOleCommandTarget * pOct; + HKEY hkey; + CLSID clsid; + WCHAR name[MAX_PATH]; + WCHAR value[MAX_PATH]; + DWORD type; + LONG ret; + HDPA hdpa; + HRESULT hr = S_OK; + int count = 0; + + hdpa = DPA_Create(5); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad", + &hkey)) + { + return HRESULT_FROM_WIN32(GetLastError()); + } + + /* Enumerate */ + do + { + DWORD name_len = MAX_PATH; + DWORD value_len = sizeof(value); /* byte count! */ + + ret = RegEnumValueW(hkey, count, name, &name_len, 0, &type, (LPBYTE) &value, &value_len); + if (ret) + break; + + if (type != REG_SZ) + continue; + + hr = CLSIDFromString(value, &clsid); + if (FAILED(hr)) + goto cleanup; + + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (VOID**) &pOct); + if (FAILED(hr)) + goto cleanup; + + DPA_AppendPtr(hdpa, pOct); + + count++; + } + while (1); + + if (ret != ERROR_NO_MORE_ITEMS) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto cleanup; + } + + RegCloseKey(hkey); + + /* Initialize */ + DPA_EnumCallback(hdpa, InitializeAllCallback, &hr); + if (FAILED(hr)) + goto cleanup; + + *phdpa = hdpa; + return count > 0 ? S_OK : S_FALSE; + +cleanup: + *phdpa = NULL; + ShutdownShellServices(hdpa); + return hr; +} + +HRESULT ShutdownShellServices(HDPA hdpa) +{ + DPA_EnumCallback(hdpa, ShutdownAllCallback, NULL); + DPA_EnumCallback(hdpa, DeleteAllEnumCallback, NULL); + DPA_Destroy(hdpa); + return S_OK; +} Propchange: branches/shell-experiments/base/shell/explorer-new/shellservice.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Jul 5 00:35:43 2014 @@ -437,7 +437,7 @@ CopyMemory( &data, (PSYS_PAGER_COPY_DATA) cpData->lpData, - cpData->dwData); + cpData->cbData); iconData = &data.nicon_data; switch (data.notify_code) Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Jul 5 00:35:43 2014 @@ -20,6 +20,9 @@ #include "precomp.h" +extern HRESULT InitShellServices(HDPA * phdpa); +extern HRESULT ShutdownShellServices(HDPA hdpa); + static const TRAYWINDOW_CTXMENU TrayWindowCtxMenu; #define WM_APP_TRAYDESTROY (WM_APP + 0x100) @@ -94,6 +97,8 @@ HWND hwndTrayPropertiesOwner; HWND hwndRunFileDlgOwner; + + HDPA hdpaShellServices; } ITrayWindowImpl; BOOL LaunchCPanel(HWND hwnd, LPCTSTR applet) @@ -659,6 +664,8 @@ ITrayWindowImpl_ResizeWorkArea(IN OUT ITrayWindowImpl *This) { RECT rcTray,rcWorkArea; + + return; /* If monitor has changed then fix the previous monitors work area */ if (This->PreviousMonitor != This->Monitor) @@ -768,10 +775,11 @@ /* FIXME: Are there more flags? */ - if (sr.Position > ABE_BOTTOM) - This->Position = ABE_BOTTOM; - else - This->Position = sr.Position; + //if (sr.Position > ABE_BOTTOM) + // This->Position = ABE_BOTTOM; + //else + // This->Position = sr.Position; + This->Position = ABE_LEFT; /* Try to find out which monitor the tray window was located on last. Here we're only interested in the monitor screen that we think @@ -985,6 +993,13 @@ { (void)InterlockedExchangePointer((PVOID*)&This->hWnd, NULL); + + + if (This->hdpaShellServices != NULL) + { + ShutdownShellServices(This->hdpaShellServices); + This->hdpaShellServices = NULL; + } if (This->himlStartBtn != NULL) { @@ -1586,6 +1601,8 @@ /* Align all controls on the tray window */ ITrayWindowImpl_AlignControls(This, NULL); + + InitShellServices(&(This->hdpaShellServices)); } static HRESULT STDMETHODCALLTYPE

1 0

[dquintana] 63683: [RSHELL] * Handle SMSET_BOTTOM on SetShellFolder so the shell items show below the static menu. * Downgrade some DbgPrints to TRACEs (reduces log spam). * Add some extra debuggin...
by dquintana＠svn.reactos.org 02 Jul '14

02 Jul '14

Author: dquintana Date: Wed Jul 2 14:48:21 2014 New Revision: 63683 URL: http://svn.reactos.org/svn/reactos?rev=63683&view=rev Log: [RSHELL] * Handle SMSET_BOTTOM on SetShellFolder so the shell items show below the static menu. * Downgrade some DbgPrints to TRACEs (reduces log spam). * Add some extra debugging messages to CMergedFolder. * Export the CMergedFolder constructor so it can be used from browseui. [BROWSEUI] * Use merged folders for the Favorites menu. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/base/shell/rshell/rshell.spec branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/shlwapi/CMakeLists.txt Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -75,7 +75,8 @@ m_hotItem(-1), m_popupBar(NULL), m_popupItem(-1), - m_Show(FALSE) + m_Show(FALSE), + m_shellBottom(FALSE) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -292,21 +293,43 @@ int syStatic = maxStatic.cy; int syShlFld = sy - syStatic; - if (m_SFToolbar) - { - m_SFToolbar->SetPosSize( - prc->left, - prc->top, - prc->right - prc->left, - syShlFld); - } - if (m_staticToolbar) - { - m_staticToolbar->SetPosSize( - prc->left, - prc->top + syShlFld, - prc->right - prc->left, - syStatic); + if (m_shellBottom) + { + if (m_SFToolbar) + { + m_SFToolbar->SetPosSize( + prc->left, + prc->top + syStatic, + prc->right - prc->left, + syShlFld); + } + if (m_staticToolbar) + { + m_staticToolbar->SetPosSize( + prc->left, + prc->top, + prc->right - prc->left, + syStatic); + } + } + else // shell menu on top + { + if (m_SFToolbar) + { + m_SFToolbar->SetPosSize( + prc->left, + prc->top, + prc->right - prc->left, + syShlFld); + } + if (m_staticToolbar) + { + m_staticToolbar->SetPosSize( + prc->left, + prc->top + syShlFld, + prc->right - prc->left, + syStatic); + } } return S_OK; @@ -637,6 +660,8 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + m_shellBottom = (dwFlags & SMSET_BOTTOM) != 0; + if (m_site) { HWND hwndParent; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -66,6 +66,7 @@ INT m_popupItem; BOOL m_Show; + BOOL m_shellBottom; public: CMenuBand(); Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -315,7 +315,7 @@ StackEntry * entry = NULL; if (IsTrackedWindow(child, &entry) == S_OK) { - DbgPrint("MouseMove %d\n", m_isLButtonDown); + TRACE("MouseMove %d\n", m_isLButtonDown); } BOOL isTracking = FALSE; @@ -392,7 +392,7 @@ if (IsTrackedWindow(child, &entry) != S_OK) return TRUE; - DbgPrint("MouseDown %d\n", m_isLButtonDown); + TRACE("MouseDown %d\n", m_isLButtonDown); BOOL isTracking = FALSE; if (entry) @@ -403,7 +403,7 @@ if (iHitTestResult >= 0) { - DbgPrint("MouseDown send %d\n", iHitTestResult); + TRACE("MouseDown send %d\n", iHitTestResult); entry->mb->_MenuBarMouseDown(child, iHitTestResult); } } @@ -414,7 +414,7 @@ m_movedSinceDown = FALSE; m_windowAtDown = child; - DbgPrint("MouseDown end %d\n", m_isLButtonDown); + TRACE("MouseDown end %d\n", m_isLButtonDown); return TRUE; } @@ -442,7 +442,7 @@ if (IsTrackedWindow(child, &entry) != S_OK) return TRUE; - DbgPrint("MouseUp %d\n", m_isLButtonDown); + TRACE("MouseUp %d\n", m_isLButtonDown); BOOL isTracking = FALSE; if (entry) @@ -453,7 +453,7 @@ if (iHitTestResult >= 0) { - DbgPrint("MouseUp send %d\n", iHitTestResult); + TRACE("MouseUp send %d\n", iHitTestResult); entry->mb->_MenuBarMouseUp(child, iHitTestResult); } } Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -356,6 +356,18 @@ return hr; } +CMergedFolder::CMergedFolder() : + m_UserLocal(NULL), + m_AllUSers(NULL), + m_EnumSource(NULL), + m_shellPidl(NULL) +{ +} + +CMergedFolder::~CMergedFolder() +{ +} + HRESULT CMergedFolder::_SetSources(IShellFolder* userLocal, IShellFolder* allUsers) { m_UserLocal = userLocal; @@ -382,6 +394,7 @@ SHCONTF grfFlags, IEnumIDList **ppenumIDList) { + DbgPrint("EnumObjects\n"); HRESULT hr = m_EnumSource->QueryInterface(IID_PPV_ARG(IEnumIDList, ppenumIDList)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -397,12 +410,14 @@ LocalPidlInfo info; HRESULT hr; + DbgPrint("BindToObject\n"); + hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; if (!info.shared) - return info.parent->BindToObject(pidl, pbcReserved, riid, ppvOut); + return info.parent->BindToObject(info.pidl, pbcReserved, riid, ppvOut); if (riid != IID_IShellFolder) return E_FAIL; @@ -410,11 +425,11 @@ CComPtr<IShellFolder> fld1; CComPtr<IShellFolder> fld2; - hr = m_UserLocal->BindToObject(pidl, pbcReserved, IID_PPV_ARG(IShellFolder, &fld1)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = m_AllUSers->BindToObject(pidl, pbcReserved, IID_PPV_ARG(IShellFolder, &fld2)); + hr = m_UserLocal->BindToObject(info.pidl, pbcReserved, IID_PPV_ARG(IShellFolder, &fld1)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = m_AllUSers->BindToObject(info.pidl, pbcReserved, IID_PPV_ARG(IShellFolder, &fld2)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -436,6 +451,7 @@ LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { + DbgPrint("CompareIDs\n"); return m_UserLocal->CompareIDs(lParam, pidl1, pidl2); } @@ -456,6 +472,8 @@ LocalPidlInfo info; HRESULT hr; + DbgPrint("GetAttributesOf\n"); + for (int i = 0; i < (int)cidl; i++) { LPCITEMIDLIST pidl = apidl[i]; @@ -463,6 +481,8 @@ hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; + + pidl = info.pidl; SFGAOF * pinOut1 = rgfInOut ? rgfInOut + i : NULL; @@ -486,6 +506,8 @@ LocalPidlInfo info; HRESULT hr; + DbgPrint("GetUIObjectOf\n"); + for (int i = 0; i < (int)cidl; i++) { LPCITEMIDLIST pidl = apidl[i]; @@ -495,6 +517,8 @@ hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; + + pidl = info.pidl; TRACE("FindPidlInList succeeded with parent %p and pidl { db=%d }\n", info.parent, info.pidl->mkid.cb); @@ -518,11 +542,13 @@ LocalPidlInfo info; HRESULT hr; + DbgPrint("GetDisplayNameOf\n"); + hr = m_EnumSource->FindPidlInList(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = info.parent->GetDisplayNameOf(pidl, uFlags, lpName); + hr = info.parent->GetDisplayNameOf(info.pidl, uFlags, lpName); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -43,8 +43,8 @@ LPITEMIDLIST m_shellPidl; public: - CMergedFolder() {} - virtual ~CMergedFolder() {} + CMergedFolder(); + virtual ~CMergedFolder(); HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers); Modified: branches/shell-experiments/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -2,3 +2,4 @@ @ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr); +@ stdcall CMergedFolder_Constructor(ptr ptr ptr ptr) Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -74,6 +74,7 @@ extern HRESULT CreateAddressBand(REFIID riid, void **ppv); typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); HRESULT IUnknown_HasFocusIO(IUnknown * punk) { @@ -397,6 +398,9 @@ CComPtr<IShellMenu> newMenu; CComPtr<IShellFolder> favoritesFolder; LPITEMIDLIST favoritesPIDL; + CComPtr<IShellFolder> commonFavsFolder; + LPITEMIDLIST commonFavsPIDL; + CComPtr<IShellFolder> mergedFolder; HWND ownerWindow; HMENU parentHMenu; HMENU favoritesHMenu; @@ -456,7 +460,28 @@ return hResult; RegCreateKeyEx(HKEY_CURRENT_USER, szFavoritesKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &orderRegKey, &disposition); - hResult = newMenu->SetShellFolder(favoritesFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | 0x18); +#if 1 /*USE_MERGED_FAVORITES*/ + hResult = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &commonFavsPIDL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = SHBindToFolder(commonFavsPIDL, &commonFavsFolder); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ILFree(commonFavsPIDL); + + PMERGEDFOLDER_CONSTRUCTOR mfconstruct = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hrs, "CMergedFolder_Constructor"); + if (mfconstruct) + { + hResult = mfconstruct(favoritesFolder, commonFavsFolder, IID_PPV_ARG(IShellFolder, &mergedFolder)); + } + else + { + mergedFolder = favoritesFolder; + } +#else + mergedFolder = favoritesFolder; +#endif + hResult = newMenu->SetShellFolder(mergedFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | SMINIT_CACHED | SMINV_ID); ILFree(favoritesPIDL); if (SUCCEEDED(hResult)) fFavoritesMenu.Attach(newMenu.Detach()); Modified: branches/shell-experiments/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… ============================================================================== --- branches/shell-experiments/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Wed Jul 2 14:48:21 2014 @@ -1,3 +1,5 @@ + +project(SHELL) add_definitions( -D__WINESRC__

1 0

[akhaldi] 63682: [URLMON] * Add HlinkGoBack stub. Needed by *cough* certain apps. CORE-8174
by akhaldi＠svn.reactos.org 02 Jul '14

02 Jul '14

Author: akhaldi Date: Wed Jul 2 00:11:19 2014 New Revision: 63682 URL: http://svn.reactos.org/svn/reactos?rev=63682&view=rev Log: [URLMON] * Add HlinkGoBack stub. Needed by *cough* certain apps. CORE-8174 Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Wed Jul 2 00:11:19 2014 @@ -46,7 +46,7 @@ #145 stub GetComponentIDFromCLSSPEC #146 stub GetMarkOfTheWeb 147 stdcall GetSoftwareUpdateInfo(ptr ptr) -#148 stub HlinkGoBack +148 stdcall -stub HlinkGoBack(ptr) #149 stub HlinkGoForward #150 stub HlinkNavigateMoniker 151 stdcall HlinkNavigateString(ptr wstr)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2014