Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[rharabien] 54697: [SHELL32] - Properly check if PIDL is folder. Folders doesn't has "Open With" context menu item anymore.
by rharabien＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: rharabien Date: Mon Dec 19 11:47:30 2011 New Revision: 54697 URL: http://svn.reactos.org/svn/reactos?rev=54697&view=rev Log: [SHELL32] - Properly check if PIDL is folder. Folders doesn't has "Open With" context menu item anymore. Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Mon Dec 19 11:47:30 2011 @@ -1011,8 +1011,8 @@ FORMATETC fmt; HRESULT hr; LPIDA pida; - LPCITEMIDLIST pidl_folder; - LPCITEMIDLIST pidl_child; + LPCITEMIDLIST pidlFolder; + LPCITEMIDLIST pidlChild; LPCITEMIDLIST pidl; DWORD dwType; LPWSTR pszExt; @@ -1035,10 +1035,10 @@ pida = (LPIDA)GlobalLock(medium.hGlobal); ASSERT(pida->cidl == 1); - pidl_folder = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[0]); - pidl_child = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[1]); - - pidl = ILCombine(pidl_folder, pidl_child); + pidlFolder = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[0]); + pidlChild = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[1]); + + pidl = ILCombine(pidlFolder, pidlChild); GlobalUnlock(medium.hGlobal); GlobalFree(medium.hGlobal); @@ -1048,8 +1048,9 @@ ERR("no mem\n"); return E_OUTOFMEMORY; } - if (_ILIsDesktop(pidl) || _ILIsMyDocuments(pidl) || _ILIsControlPanel(pidl) || _ILIsNetHood(pidl) || - _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl)) + if (_ILIsDesktop(pidlChild) || _ILIsMyDocuments(pidlChild) || _ILIsControlPanel(pidlChild) || + _ILIsNetHood(pidlChild) || _ILIsBitBucket(pidlChild) || _ILIsDrive(pidlChild) || + _ILIsCPanelStruct(pidlChild) || _ILIsFolder(pidlChild) || _ILIsMyComputer(pidlChild)) { TRACE("pidl is a folder\n"); SHFree((void*)pidl);

1 0

[rharabien] 54696: [SHELL32] - Move "Open With" context menu handler registration to shell32 - Improve Polish translation
by rharabien＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: rharabien Date: Mon Dec 19 11:37:46 2011 New Revision: 54696 URL: http://svn.reactos.org/svn/reactos?rev=54696&view=rev Log: [SHELL32] - Move "Open With" context menu handler registration to shell32 - Improve Polish translation Added: trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -4,10 +4,8 @@ [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 - ; Default key HKCR,"*","",0x00000000,"" -HKCR,"*\shellex\ContextMenuHandlers\Open With","",0x00000000,"{09799AFB-AD67-11d1-ABCD-00C04FC30936}" ; Folders HKCR,"Folder","",0x00000000,"Folder" @@ -333,10 +331,6 @@ HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 ; Open With shell extension -HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler" -HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}\shellex\MayChangeDefaultMenu","",0x00000000,"" HKCR,"SystemFileAssociations","",0x00000000,"" HKCR,"Applications","",0x00000000,"" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -721,7 +721,7 @@ IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Dysk sieciowy" - IDS_OPEN_WITH "OtwÃ³rz z" + IDS_OPEN_WITH "OtwÃ³rz za pomocÄ" IDS_OPEN_WITH_CHOOSE "Wybierz program..." IDS_SHELL_ABOUT_AUTHORS "&Autorzy" Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -1049,7 +1049,7 @@ return E_OUTOFMEMORY; } if (_ILIsDesktop(pidl) || _ILIsMyDocuments(pidl) || _ILIsControlPanel(pidl) || _ILIsNetHood(pidl) || - _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl)) + _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl)) { TRACE("pidl is a folder\n"); SHFree((void*)pidl); @@ -1076,7 +1076,7 @@ pszExt = wcsrchr(szPath, L'.'); if (pszExt && !_wcsicmp(pszExt, szShortCut)) { - FIXME("pidl is a shortcut\n"); + TRACE("pidl is a shortcut\n"); return E_FAIL; } @@ -1105,7 +1105,6 @@ if (poainfo->pcszClass == NULL && poainfo->pcszFile == NULL) return E_FAIL; - hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(OPEN_WITH_PROGRAMM_DLG), hwndParent, OpenWithProgrammDlg, (LPARAM)poainfo); if (hwnd == NULL) Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -51,7 +51,7 @@ // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - DECLARE_NO_REGISTRY() + DECLARE_REGISTRY_RESOURCEID(IDR_OPENWITHMENU) DECLARE_NOT_AGGREGATABLE(COpenWithMenu) DECLARE_PROTECT_FINAL_CONSTRUCT() Added: trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -1,0 +1,34 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {09799AFB-AD67-11d1-ABCD-00C04FC30936} = s 'Open With Context Menu Handler' + { + val InfoTip = e '@%%SystemRoot%%\system32\SHELL32.dll,-22924' + val LocalizedString = e '@%%SystemRoot%%\system32\SHELL32.dll,-22985' + DefaultIcon = e '%%SystemRoot%%\system32\SHELL32.dll,-210' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + shellex + { + MayChangeDefaultMenu + { + } + } + } + } + NoRemove * + { + NoRemove shellex + { + NoRemove ContextMenuHandlers + { + ForceRemove Open With = s '{09799AFB-AD67-11d1-ABCD-00C04FC30936}' + { + } + } + } + } +} Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -20,3 +20,4 @@ IDR_SHELLFSFOLDER REGISTRY "res\\rgs\\shellfsfolder.rgs" IDR_SHELLLINK REGISTRY "res\\rgs\\shelllink.rgs" IDR_STARTMENU REGISTRY "res\\rgs\\startmenu.rgs" +IDR_OPENWITHMENU REGISTRY "res\\rgs\\openwithmenu.rgs" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Dec 19 11:37:46 2011 @@ -471,5 +471,6 @@ #define IDR_SHELLFSFOLDER 143 #define IDR_SHELLLINK 144 #define IDR_STARTMENU 145 +#define IDR_OPENWITHMENU 146 #endif

1 0

[spetreolle] 54695: [SSSTARS] Fix include paths casing.
by spetreolle＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: spetreolle Date: Mon Dec 19 10:22:06 2011 New Revision: 54695 URL: http://svn.reactos.org/svn/reactos?rev=54695&view=rev Log: [SSSTARS] Fix include paths casing. Modified: trunk/rosapps/applications/screensavers/ssstars/ssstars.c Modified: trunk/rosapps/applications/screensavers/ssstars/ssstars.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/ssstars.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/ssstars.c [iso-8859-1] Mon Dec 19 10:22:06 2011 @@ -27,8 +27,8 @@ #include <time.h> #include <math.h> -#include <gl/gl.h> -#include <gl/glu.h> +#include <GL/gl.h> +#include <GL/glu.h> #include "resource.h" #include "settings.h"

1 0

[cgutman] 54694: [NTOSKRNL] - Lock the registry before flushing hives to avoid, among other things, use of an ERESOURCE without being inside a critical region
by cgutman＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: cgutman Date: Mon Dec 19 09:33:40 2011 New Revision: 54694 URL: http://svn.reactos.org/svn/reactos?rev=54694&view=rev Log: [NTOSKRNL] - Lock the registry before flushing hives to avoid, among other things, use of an ERESOURCE without being inside a critical region Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Dec 19 09:33:40 2011 @@ -1933,9 +1933,13 @@ NTAPI CmShutdownSystem(VOID) { - /* Kill the workers and flush all hives */ + /* Kill the workers */ if (!CmFirstTime) CmpShutdownWorkers(); + + /* Flush all hives */ + CmpLockRegistryExclusive(); CmpDoFlushAll(TRUE); + CmpUnlockRegistry(); } VOID

1 0

[cgutman] 54693: [NTOSKRNL] - Tweak the balancer a bit to favor RosMm allocations in low memory scenarios - Fix the balancer out of memory warning
by cgutman＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: cgutman Date: Mon Dec 19 08:49:42 2011 New Revision: 54693 URL: http://svn.reactos.org/svn/reactos?rev=54693&view=rev Log: [NTOSKRNL] - Tweak the balancer a bit to favor RosMm allocations in low memory scenarios - Fix the balancer out of memory warning Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Dec 19 08:49:42 2011 @@ -108,8 +108,7 @@ { if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (MmAvailablePages < MiMinimumAvailablePages || - (Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock)) == NULL) + if ((Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock)) == NULL) { OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MmDereferencePage(Page); @@ -165,9 +164,6 @@ Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); DPRINT("Trimming consumer %d: Freed %d pages with a target of %d pages\n", Consumer, NrFreedPages, Target); - - if (NrFreedPages == 0) - DPRINT1("Ran out of pages to swap!\n"); if (!NT_SUCCESS(Status)) { @@ -355,6 +351,12 @@ for (i = 0; i < MC_MAXIMUM; i++) { MiTrimMemoryConsumer(i); + } + + if (MmAvailablePages < MiMinimumAvailablePages) + { + /* This is really bad... */ + DPRINT1("Balancer failed to resolve low memory condition! Complete memory exhaustion is imminent!\n"); } } else

1 0

[cgutman] 54692: [NTOSKRNL] - Always use push locks within a critical region
by cgutman＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: cgutman Date: Mon Dec 19 08:22:16 2011 New Revision: 54692 URL: http://svn.reactos.org/svn/reactos?rev=54692&view=rev Log: [NTOSKRNL] - Always use push locks within a critical region Modified: trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5469… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Mon Dec 19 08:22:16 2011 @@ -240,6 +240,7 @@ IoStatus->Information = 0; if (WriteThrough) { + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&iBcb->CacheSegment->Lock); if (iBcb->CacheSegment->Dirty) { @@ -250,6 +251,7 @@ IoStatus->Status = STATUS_SUCCESS; } ExReleasePushLockExclusive(&iBcb->CacheSegment->Lock); + KeLeaveCriticalRegion(); } else { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=546… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon Dec 19 08:22:16 2011 @@ -448,6 +448,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); ExReleasePushLock(&CacheSeg->Lock); + KeLeaveCriticalRegion(); return(STATUS_SUCCESS); } @@ -476,6 +477,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&current->Lock); return(current); } @@ -525,6 +527,7 @@ CacheSeg->Dirty = TRUE; ExReleasePushLock(&CacheSeg->Lock); + KeLeaveCriticalRegion(); return(STATUS_SUCCESS); } @@ -574,6 +577,8 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExReleasePushLock(&CacheSeg->Lock); + KeLeaveCriticalRegion(); + return(STATUS_SUCCESS); } @@ -621,6 +626,7 @@ current->DirtySegmentListEntry.Blink = NULL; current->ReferenceCount = 1; ExInitializePushLock(&current->Lock); + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&current->Lock); KeAcquireGuardedMutex(&ViewLock); @@ -655,7 +661,8 @@ KeReleaseGuardedMutex(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; - ExAcquirePushLockExclusive(&current->Lock); + /* We're still in the critical region from above */ + ExAcquirePushLockExclusive(&current->Lock); return STATUS_SUCCESS; } if (current->FileOffset < FileOffset) @@ -1040,8 +1047,9 @@ IoStatus->Status = Status; } } + ExReleasePushLock(&current->Lock); + KeLeaveCriticalRegion(); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - ExReleasePushLock(&current->Lock); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); }

1 0

[jimtabor] 54691: [User32] - Add back hack for CMD scroll bar tracking. Miscellaneous cosmetic changes. Still working on scroll regressions.
by jimtabor＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: jimtabor Date: Mon Dec 19 06:45:37 2011 New Revision: 54691 URL: http://svn.reactos.org/svn/reactos?rev=54691&view=rev Log: [User32] - Add back hack for CMD scroll bar tracking. Miscellaneous cosmetic changes. Still working on scroll regressions. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Mon Dec 19 06:45:37 2011 @@ -572,7 +572,7 @@ *ThumbPos = *ThumbSize = 0; } else - { + { SCROLLINFO Info; NtUserSBGetParms(Wnd, Bar, NULL, &Info); @@ -580,39 +580,43 @@ Pixels -= (2 * GetSystemMetrics(SM_CXVSCROLL)); if (0 != Info.nPage) - { + { *ThumbSize = MulDiv(Pixels, Info.nPage, (Info.nMax - Info.nMin + 1)); if (*ThumbSize < SCROLL_MIN_THUMB) - { + { *ThumbSize = SCROLL_MIN_THUMB; - } - } + } + } else - { + { *ThumbSize = GetSystemMetrics(SM_CXVSCROLL); - } - + } + +//#if 0 /* FIXME */ if (((Pixels -= *ThumbSize ) < 0) || (( pSBInfo->WSBflags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)) - { +//#else +// if ((Pixels -= *ThumbSize ) < 0) +//#endif + { /* Rectangle too small or scrollbar disabled -> no thumb */ *ThumbPos = *ThumbSize = 0; - } + } else - { + { INT Max = Info.nMax - max(Info.nPage - 1, 0); if (Max <= Info.nMin) - { + { *ThumbPos = *ArrowSize; - } + } else - { + { *ThumbPos = *ArrowSize + MulDiv(Pixels, (Info.nPos - Info.nMin), (Max - Info.nMin)); - } - } - } + } + } + } return Vertical; } @@ -806,23 +810,22 @@ SETSCROLLBARINFO NewInfo; if (! IntGetScrollBarInfo(Wnd, SBType, &ScrollBarInfo)) - { - return; - } - if (SCROLL_NOWHERE == ScrollTrackHitTest && WM_LBUTTONDOWN != Msg) - { - return; - } + { + return; + } + if ((ScrollTrackHitTest == SCROLL_NOWHERE) && (Msg != WM_LBUTTONDOWN)) + { + return; + } NewInfo.nTrackPos = ScrollTrackingVal; NewInfo.reserved = ScrollBarInfo.reserved; memcpy(NewInfo.rgstate, ScrollBarInfo.rgstate, (CCHILDREN_SCROLLBAR + 1) * sizeof(DWORD)); - if (SB_CTL == SBType - && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) - { + if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) + { switch(Msg) - { + { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(Wnd); /* hide caret while holding down LBUTTON */ SetCapture(Wnd); @@ -836,36 +839,33 @@ case WM_LBUTTONUP: ReleaseCapture(); ScrollTrackHitTest = HitTest = SCROLL_NOWHERE; - if (Wnd == GetFocus()) - { - ShowCaret(Wnd); - } + if (Wnd == GetFocus()) ShowCaret(Wnd); break; case WM_SYSTIMER: Pt = PrevPt; break; - } + } return; - } + } Dc = GetDCEx(Wnd, 0, DCX_CACHE | ((SB_CTL == SBType) ? 0 : DCX_WINDOW)); if (SB_VERT == SBType) - { + { Vertical = TRUE; - } + } else if (SB_HORZ == SBType) - { + { Vertical = FALSE; - } + } else - { + { Vertical = (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_VERT)); - } + } WndOwner = (SB_CTL == SBType) ? GetParent(Wnd) : Wnd; WndCtl = (SB_CTL == SBType) ? Wnd : NULL; switch (Msg) - { + { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(Wnd); /* hide caret while holding down LBUTTON */ ScrollTrackVertical = Vertical; @@ -875,10 +875,7 @@ LastMousePos = LastClickPos; TrackThumbPos = ScrollBarInfo.xyThumbTop; PrevPt = Pt; - if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) - { - SetFocus(Wnd); - } + if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) SetFocus(Wnd); SetCapture(Wnd); ScrollBarInfo.rgstate[ScrollTrackHitTest] |= STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; @@ -894,10 +891,7 @@ HitTest = SCROLL_NOWHERE; ReleaseCapture(); /* if scrollbar has focus, show back caret */ - if (Wnd == GetFocus()) - { - ShowCaret(Wnd); - } + if (Wnd == GetFocus()) ShowCaret(Wnd); ScrollBarInfo.rgstate[ScrollTrackHitTest] &= ~STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); @@ -910,7 +904,10 @@ default: return; /* Should never happen */ - } + } + + TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", + Wnd, SBType, SPY_GetMsgName(Msg,Wnd), Pt.x, Pt.y, HitTest ); switch (ScrollTrackHitTest) { @@ -954,7 +951,7 @@ break; case SCROLL_THUMB: - if (WM_LBUTTONDOWN == Msg) + if (Msg == WM_LBUTTONDOWN) { ScrollTrackingWin = Wnd; ScrollTrackingBar = SBType; @@ -965,7 +962,7 @@ NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); IntScrollDrawMovingThumb(Dc, &ScrollBarInfo, Vertical); } - else if (WM_LBUTTONUP == Msg) + else if (Msg == WM_LBUTTONUP) { ScrollTrackingWin = 0; ScrollTrackingVal = 0; @@ -1004,7 +1001,7 @@ case SCROLL_BOTTOM_RECT: if (HitTest == ScrollTrackHitTest) { - if ((WM_LBUTTONDOWN == Msg) || (WM_SYSTIMER == Msg)) + if ((Msg == WM_LBUTTONDOWN) || (Msg == WM_SYSTIMER)) { SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_PAGEDOWN, (LPARAM) WndCtl); @@ -1022,7 +1019,7 @@ case SCROLL_BOTTOM_ARROW: if (HitTest == ScrollTrackHitTest) { - if ((WM_LBUTTONDOWN == Msg) || (WM_SYSTIMER == Msg)) + if ((Msg == WM_LBUTTONDOWN) || (Msg == WM_SYSTIMER)) { SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_LINEDOWN, (LPARAM) WndCtl); @@ -1031,14 +1028,11 @@ SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, (TIMERPROC) NULL); } - else - { - KillSystemTimer(Wnd, SCROLL_TIMER); - } - break; - } - - if (WM_LBUTTONDOWN == Msg) + else KillSystemTimer(Wnd, SCROLL_TIMER); + break; + } + + if (Msg == WM_LBUTTONDOWN) { if (SCROLL_THUMB == HitTest) { @@ -1049,7 +1043,7 @@ } } - if (WM_LBUTTONUP == Msg) + if (Msg == WM_LBUTTONUP) { HitTest = ScrollTrackHitTest; ScrollTrackHitTest = SCROLL_NOWHERE; /* Terminate tracking */ @@ -1061,8 +1055,12 @@ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM(SB_THUMBPOSITION, Val), (LPARAM) WndCtl); } + /* SB_ENDSCROLL doesn't report thumb position */ SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_ENDSCROLL, (LPARAM) WndCtl); + + /* Terminate tracking */ + ScrollTrackingWin = 0; } ReleaseDC(Wnd, Dc); @@ -1091,6 +1089,7 @@ TRACE("hwnd=%p lpCreate=%p\n", Wnd, lpCreate); +//#if 0 /* FIXME */ if (lpCreate->style & WS_DISABLED) { // info->flags = ESB_DISABLE_BOTH; @@ -1098,7 +1097,7 @@ NtUserMessageCall( Wnd, WM_ENABLE, FALSE, 0, 0, FNID_SCROLLBAR, FALSE); ERR("Created WS_DISABLED scrollbar\n"); } - +//#endif if (0 != (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX))) { if (0 != (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN)) @@ -1197,12 +1196,18 @@ UINT XOffset = 0, YOffset = 0; if (SBType != SB_CTL) - { - RECT rect; - GetClientRect(Wnd, &rect); + { // Replace HAX for CMD mouse tracking. + PWND pwnd = ValidateHwnd(Wnd); + if (!pwnd) return; + XOffset = pwnd->rcClient.left - pwnd->rcWindow.left; + YOffset = pwnd->rcClient.top - pwnd->rcWindow.top; +// RECT rect; +// GetClientRect(Wnd, &rect); ScreenToClient(Wnd, &Pt); - Pt.x -= rect.left; - Pt.y -= rect.top; +// Pt.x -= rect.left; +// Pt.y -= rect.top; + Pt.x += XOffset; + Pt.y += YOffset; } IntScrollHandleScrollEvent(Wnd, SBType, WM_LBUTTONDOWN, Pt);

1 0

[cgutman] 54690: [NTOSKRNL] - Only unmap pages if they were mapped - Make sure the page reference counts are sane when freeing the cache memory area
by cgutman＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: cgutman Date: Mon Dec 19 02:56:58 2011 New Revision: 54690 URL: http://svn.reactos.org/svn/reactos?rev=54690&view=rev Log: [NTOSKRNL] - Only unmap pages if they were mapped - Make sure the page reference counts are sane when freeing the cache memory area Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=546… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Mon Dec 19 02:56:58 2011 @@ -645,7 +645,10 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = Iosb.Status; } + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } if (!NT_SUCCESS(Status)) { return(FALSE); Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=546… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon Dec 19 02:56:58 2011 @@ -899,6 +899,7 @@ ASSERT(SwapEntry == 0); if (Page != 0) { + ASSERT(MmGetReferenceCountPage(Page) == 1); MmReleasePageMemoryConsumer(MC_CACHE, Page); } }

1 0

[cgutman] 54689: [NTOSKRNL] - Fix a page reference leak when reading or writing pages to the swap file
by cgutman＠svn.reactos.org 19 Dec '11

19 Dec '11

Author: cgutman Date: Mon Dec 19 01:22:37 2011 New Revision: 54689 URL: http://svn.reactos.org/svn/reactos?rev=54689&view=rev Log: [NTOSKRNL] - Fix a page reference leak when reading or writing pages to the swap file Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Mon Dec 19 01:22:37 2011 @@ -253,7 +253,6 @@ MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, &Page); - MmReferencePage(Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = offset * PAGE_SIZE; @@ -316,7 +315,6 @@ MmInitializeMdl(Mdl, NULL, PAGE_SIZE); MmBuildMdlFromPages(Mdl, &Page); - MmReferencePage(Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; file_offset.QuadPart = offset * PAGE_SIZE;

1 0

[rharabien] 54688: [SHELL32] - Fix getting name for context menu item. Fixes two "find" items in My Computer context menu. - Minor code and comments improvements
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 23:41:49 2011 New Revision: 54688 URL: http://svn.reactos.org/svn/reactos?rev=54688&view=rev Log: [SHELL32] - Fix getting name for context menu item. Fixes two "find" items in My Computer context menu. - Minor code and comments improvements Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Dec 18 23:41:49 2011 @@ -139,7 +139,7 @@ } void -CDefaultContextMenu::AddStaticEntry(const WCHAR *szVerb, const WCHAR * szClass) +CDefaultContextMenu::AddStaticEntry(const WCHAR *szVerb, const WCHAR *szClass) { PStaticShellEntry curEntry; PStaticShellEntry lastEntry = NULL; @@ -178,16 +178,10 @@ return; } - - if (lastEntry) - { lastEntry->Next = curEntry; - } else - { shead = curEntry; - } } void @@ -196,19 +190,17 @@ LONG result; DWORD dwIndex; WCHAR szName[40]; - DWORD dwName; + DWORD dwSize; dwIndex = 0; do { szName[0] = 0; - dwName = sizeof(szName) / sizeof(WCHAR); - result = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); - szName[(sizeof(szName)/sizeof(WCHAR))-1] = 0; + dwSize = sizeof(szName) / sizeof(WCHAR); + result = RegEnumKeyExW(hKey, dwIndex, szName, &dwSize, NULL, NULL, NULL, NULL); if (result == ERROR_SUCCESS) - { AddStaticEntry(szName, szClass); - } + dwIndex++; } while(result == ERROR_SUCCESS); } @@ -600,7 +592,6 @@ UINT idResource; PStaticShellEntry curEntry; WCHAR szVerb[40]; - WCHAR szTemp[50]; DWORD dwSize; UINT fState; UINT Length; @@ -618,6 +609,8 @@ while(curEntry) { fState = MFS_ENABLED; + mii.dwTypeData = NULL; + if (!wcsicmp(curEntry->szVerb, L"open")) { fState |= MFS_DEFAULT; @@ -644,38 +637,26 @@ if (idResource > 0) { if (LoadStringW(shell32_hInstance, idResource, szVerb, sizeof(szVerb) / sizeof(WCHAR))) + mii.dwTypeData = szVerb; /* use translated verb */ + else + ERR("Failed to load string, defaulting to NULL value for mii.dwTypeData\n"); + } + else + { + WCHAR wszKey[256]; + Length = wcslen(curEntry->szClass) + wcslen(curEntry->szVerb) + 8; + if (Length < sizeof(wszKey) / sizeof(WCHAR)) { - /* use translated verb */ - szVerb[(sizeof(szVerb)/sizeof(WCHAR))-1] = L'\0'; - mii.dwTypeData = szVerb; + wcscpy(wszKey, curEntry->szClass); + wcscat(wszKey, L"\\shell\\"); + wcscat(wszKey, curEntry->szVerb); + dwSize = sizeof(szVerb); + + if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, NULL, RRF_RT_REG_SZ, NULL, szVerb, &dwSize) == ERROR_SUCCESS) + mii.dwTypeData = szVerb; /* use description for the menu entry */ + else + mii.dwTypeData = curEntry->szVerb; /* use verb for the menu entry */ } - else - { - ERR("Failed to load string, defaulting to NULL value for mii.dwTypeData\n"); - } - } - else - { - Length = wcslen(curEntry->szClass) + wcslen(curEntry->szVerb) + 8; - if (Length < sizeof(szTemp) / sizeof(WCHAR)) - { - wcscpy(szTemp, curEntry->szClass); - wcscat(szTemp, L"\\shell\\"); - wcscat(szTemp, curEntry->szVerb); - dwSize = sizeof(szVerb); - - if (RegGetValueW(HKEY_CLASSES_ROOT, szTemp, NULL, RRF_RT_REG_SZ, NULL, szVerb, &dwSize) == ERROR_SUCCESS) - { - /* use description for the menu entry */ - mii.dwTypeData = szVerb; - } - else - { - /* use verb for the menu entry */ - mii.dwTypeData = curEntry->szVerb; - } - } - } mii.cch = wcslen(mii.dwTypeData); @@ -689,7 +670,7 @@ return indexMenu; } -void WINAPI _InsertMenuItemW ( +void WINAPI _InsertMenuItemW( HMENU hmenu, UINT indexMenu, BOOL fByPosition, Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Sun Dec 18 23:41:49 2011 @@ -42,7 +42,6 @@ class CDrivesFolderEnum : public IEnumIDListImpl { - private: public: CDrivesFolderEnum(); ~CDrivesFolderEnum(); @@ -79,17 +78,18 @@ { if (CreateMyCompEnumList(dwFlags) == FALSE) return E_FAIL; + return S_OK; } /************************************************************************** * CDrivesFolderEnum::CreateMyCompEnumList() */ -static const WCHAR MyComputer_NameSpaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\Namespace"; BOOL CDrivesFolderEnum::CreateMyCompEnumList(DWORD dwFlags) { BOOL bRet = TRUE; + static const WCHAR MyComputer_NameSpaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\Namespace"; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); @@ -361,9 +361,9 @@ } /************************************************************************** -* ISF_MyComputer_fnGetAttributesOf -*/ -HRESULT WINAPI CDrivesFolder::GetAttributesOf (UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +* CDrivesFolder::GetAttributesOf +*/ +HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; static const DWORD dwComputerAttributes = @@ -662,7 +662,7 @@ } /************************************************************************** -* ISF_MyComputer_fnSetNameOf +* CDrivesFolder::SetNameOf * Changes the name of a file object or subfolder, possibly changing its item * identifier in the process. * Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Sun Dec 18 23:41:49 2011 @@ -59,11 +59,11 @@ WORD code; } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; -HANDLE OpenMRUList(HKEY hKey); - -void LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); -void LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); -void InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName); +static HANDLE OpenMRUList(HKEY hKey); + +static VOID LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); +static VOID LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); +static VOID InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName); COpenWithMenu::COpenWithMenu() { @@ -76,7 +76,7 @@ TRACE(" destroying IContextMenu(%p)\n", this); } -VOID +static VOID AddItem(HMENU hMenu, UINT idCmdFirst) { MENUITEMINFOW mii; @@ -105,8 +105,7 @@ InsertMenuItemW(hMenu, -1, TRUE, &mii); } -static -void +static VOID LoadOWItems(POPEN_WITH_CONTEXT pContext, LPCWSTR szName) { const WCHAR * szExt; @@ -137,8 +136,6 @@ LoadItemFromHKCR(pContext, szPath); } } - - HRESULT WINAPI COpenWithMenu::QueryContextMenu( HMENU hmenu, @@ -204,13 +201,13 @@ mii.wID = Context.idCmdFirst; mii.fType = MFT_STRING; - if (InsertMenuItemW( hmenu, pos, TRUE, &mii)) + if (InsertMenuItemW(hmenu, pos, TRUE, &mii)) Context.Count++; return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Context.Count); } -void +static VOID FreeListItems(HWND hwndDlg) { HWND hList; @@ -234,7 +231,8 @@ } } -BOOL HideApplicationFromList(WCHAR * pFileName) +static BOOL +HideApplicationFromList(WCHAR * pFileName) { WCHAR szBuffer[100] = {'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 's', '\\', 0}; DWORD dwSize = 0; @@ -257,7 +255,7 @@ return FALSE; } -VOID +static VOID WriteStaticShellExtensionKey(HKEY hRootKey, const WCHAR * pVerb, WCHAR *pFullPath) { HKEY hShell; @@ -287,7 +285,7 @@ RegCloseKey(hShell); } -VOID +static VOID StoreNewSettings(LPCWSTR szFileName, WCHAR *szAppName) { WCHAR szBuffer[100] = { L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\"}; @@ -326,7 +324,7 @@ RegCloseKey(hKey); } -VOID +static VOID SetProgrammAsDefaultHandler(LPCWSTR szFileName, WCHAR * szAppName) { HKEY hKey; @@ -404,7 +402,7 @@ RegCloseKey(hKey); } -void +static VOID BrowseForApplication(HWND hwndDlg) { WCHAR szBuffer[64] = {0}; @@ -450,7 +448,7 @@ SendMessage(Context.hDlgCtrl, LB_SETCURSEL, count, 0); } -POPEN_ITEM_CONTEXT +static POPEN_ITEM_CONTEXT GetCurrentOpenItemContext(HWND hwndDlg) { LRESULT result; @@ -468,7 +466,7 @@ return (POPEN_ITEM_CONTEXT)result; } -void +static VOID ExecuteOpenItem(POPEN_ITEM_CONTEXT pItemContext, LPCWSTR FileName) { STARTUPINFOW si; @@ -492,8 +490,8 @@ } } - -static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK +OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; @@ -636,7 +634,7 @@ return FALSE; } -void +static VOID FreeMenuItemContext(HMENU hMenu) { INT Count; @@ -663,7 +661,6 @@ } } } - HRESULT WINAPI COpenWithMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici ) @@ -788,10 +785,7 @@ HeapFree(GetProcessHeap(), 0, pBuf); } - - - -void +static VOID InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName) { MENUITEMINFOW mii; @@ -843,13 +837,13 @@ } } -void +static VOID AddItemFromProgIDList(POPEN_WITH_CONTEXT pContext, HKEY hKey) { FIXME("implement me :)))\n"); } -HANDLE +static HANDLE OpenMRUList(HKEY hKey) { CREATEMRULISTW info; @@ -866,7 +860,7 @@ return CreateMRUListW(&info); } -void +static VOID AddItemFromMRUList(POPEN_WITH_CONTEXT pContext, HKEY hKey) { HANDLE hList; @@ -900,9 +894,7 @@ FreeMRUList(hList); } - - -void +static VOID LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt) { HKEY hKey; @@ -986,7 +978,7 @@ } } -void +static VOID LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt) { WCHAR szBuffer[MAX_PATH]; @@ -1013,7 +1005,7 @@ } HRESULT -COpenWithMenu::SHEOW_LoadOpenWithItems(IDataObject *pdtobj) +COpenWithMenu::LoadOpenWithItems(IDataObject *pdtobj) { STGMEDIUM medium; FORMATETC fmt; @@ -1024,7 +1016,7 @@ LPCITEMIDLIST pidl; DWORD dwType; LPWSTR pszExt; - static const WCHAR szShortCut[] = { '.', 'l', 'n', 'k', 0 }; + static const WCHAR szShortCut[] = L".lnk"; fmt.cfFormat = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); fmt.ptd = NULL; @@ -1100,7 +1092,7 @@ if (pdtobj == NULL) return E_INVALIDARG; - return SHEOW_LoadOpenWithItems(pdtobj); + return LoadOpenWithItems(pdtobj); } HRESULT WINAPI Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Sun Dec 18 23:41:49 2011 @@ -1,5 +1,5 @@ /* - * Open With Context Menu extension + * Open With Context Menu extension * * Copyright 2007 Johannes Anderwald <janderwald(a)reactos.org> * Copyright 2009 Andrew Hill @@ -23,43 +23,44 @@ #define _SHE_OCMENU_H_ class COpenWithMenu : - public CComCoClass<COpenWithMenu, &CLSID_OpenWithMenu>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2, - public IShellExtInit -{ -private: - LONG wId; - BOOL NoOpen; - UINT count; - WCHAR szPath[MAX_PATH]; - HMENU hSubMenu; -public: - COpenWithMenu(); - ~COpenWithMenu(); - HRESULT SHEOW_LoadOpenWithItems(IDataObject *pdtobj); + public CComCoClass<COpenWithMenu, &CLSID_OpenWithMenu>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu2, + public IShellExtInit +{ + private: + LONG wId; + BOOL NoOpen; + UINT count; + WCHAR szPath[MAX_PATH]; + HMENU hSubMenu; - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + public: + COpenWithMenu(); + ~COpenWithMenu(); + HRESULT LoadOpenWithItems(IDataObject *pdtobj); - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - // IShellExtInit - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + // IContextMenu2 + virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); -DECLARE_NO_REGISTRY() -DECLARE_NOT_AGGREGATABLE(COpenWithMenu) + // IShellExtInit + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_NO_REGISTRY() + DECLARE_NOT_AGGREGATABLE(COpenWithMenu) -BEGIN_COM_MAP(COpenWithMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) -END_COM_MAP() + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(COpenWithMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + END_COM_MAP() }; #endif // _SHE_OCMENU_H_

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
25
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 December 2011