Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[rharabien] 54687: [SHELL32] - Fix Recycle Bin attributes. Context menu does not have "Delete" option anymore. - Minor code improvements
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 22:56:13 2011 New Revision: 54687 URL: http://svn.reactos.org/svn/reactos?rev=54687&view=rev Log: [SHELL32] - Fix Recycle Bin attributes. Context menu does not have "Delete" option anymore. - Minor code improvements Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -470,7 +470,10 @@ lResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszShellFolderKey, 0, KEY_READ, &hSFKey); if (lResult != ERROR_SUCCESS) - return FALSE; + { + ERR("Cannot open key: %ls\n", wszShellFolderKey); + return FALSE; + } dwLen = sizeof(DWORD); lResult = RegQueryValueExW(hSFKey, wszCallForAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); 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 22:56:13 2011 @@ -858,7 +858,6 @@ } } - if (rfg & SFGAO_FILESYSTEM) { if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) @@ -899,14 +898,12 @@ bAddSep = TRUE; } - if (rfg & SFGAO_CANLINK) { bAddSep = FALSE; _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); } - if (rfg & SFGAO_CANDELETE) { Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -546,8 +546,8 @@ SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", - this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); + TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) return E_INVALIDARG; @@ -557,18 +557,22 @@ if (*rgfInOut == 0) *rgfInOut = ~0; - if(cidl == 0) { + if(cidl == 0) + { *rgfInOut &= dwDesktopAttributes; - } else { - while (cidl > 0 && *apidl) { - pdump (*apidl); - if (_ILIsDesktop(*apidl)) { + } + else + { + while (cidl > 0 && *apidl) + { + pdump(*apidl); + if (_ILIsDesktop(*apidl)) *rgfInOut &= dwDesktopAttributes; - } else if (_ILIsMyComputer(*apidl)) { + else if (_ILIsMyComputer(*apidl)) *rgfInOut &= dwMyComputerAttributes; - } else { - SHELL32_GetItemAttributes ((IShellFolder *)this, *apidl, rgfInOut); - } + else + SHELL32_GetItemAttributes((IShellFolder *)this, *apidl, rgfInOut); + apidl++; cidl--; } @@ -576,7 +580,7 @@ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE("-- result=0x%08x\n", *rgfInOut); return hr; } Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -583,7 +583,7 @@ SFGAOF *rgfInOut) { TRACE("(%p, %d, {%p, ...}, {%x})\n", this, cidl, apidl ? apidl[0] : NULL, (unsigned int)*rgfInOut); - *rgfInOut &= SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; + *rgfInOut &= SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sun Dec 18 22:56:13 2011 @@ -398,18 +398,18 @@ dwAttributes = *pdwAttributes; /* Attributes of some special folders are hardcoded */ - if (_ILIsDrive(pidl)) { + if (_ILIsDrive(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME; - } else if (_ILIsMyComputer(pidl) || _ILIsNetHood(pidl)) { + else if (_ILIsMyComputer(pidl) || _ILIsNetHood(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANDELETE| SFGAO_CANRENAME|SFGAO_CANLINK; - } else if (_ILIsControlPanel(pidl)) { + else if (_ILIsControlPanel(pidl)) *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_CANLINK; - } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) *pdwAttributes = dwAttributes; - } else if (_ILGetDataPointer(pidl)) + else if (_ILGetDataPointer(pidl)) { dwAttributes = _ILGetFileAttributes(pidl, NULL, 0);

1 0

[rharabien] 54686: [ATL] - Fix processing of binary data in registrar scripts
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 22:37:47 2011 New Revision: 54686 URL: http://svn.reactos.org/svn/reactos?rev=54686&view=rev Log: [ATL] - Fix processing of binary data in registrar scripts Modified: trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=5468… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Sun Dec 18 22:37:47 2011 @@ -473,7 +473,7 @@ inline unsigned int HexToBin(char a) { if (a >= '0' && a <= '9') - return a - 0x30; + return a - '0'; if (a >= 'A' && a <= 'F') return a - 'A' + 10; if (a >= 'a' && a <= 'f') @@ -630,7 +630,7 @@ return DISP_E_EXCEPTION; count = count / 2; for (curIndex = 0; curIndex < count; curIndex++) - buf->str[curIndex] = (HexToBin(buf->str[curIndex * 2]) << 4) | HexToBin(buf->str[curIndex * 2 + 1]); + ((BYTE*)buf->str)[curIndex] = (HexToBin(buf->str[curIndex * 2]) << 4) | HexToBin(buf->str[curIndex * 2 + 1]); lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_BINARY, (PBYTE)buf->str, count); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres);

1 0

[rharabien] 54685: [SHELL32] - Add back "Empty Recycle Bin" context menu item
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 21:54:59 2011 New Revision: 54685 URL: http://svn.reactos.org/svn/reactos?rev=54685&view=rev Log: [SHELL32] - Add back "Empty Recycle Bin" context menu item Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] Sun Dec 18 21:54:59 2011 @@ -23,10 +23,17 @@ } 'shellex' { - 'find' = e '@%%SystemRoot%%\system32\SHELL32.dll,-29188' + 'ContextMenuHandlers' { - 'ContextMenuHandlers' - 'PropertySheetHandlers' + '{645FF040-5081-101B-9F08-00AA002F954E}' + { + } + } + 'PropertySheetHandlers' + { + '{645FF040-5081-101B-9F08-00AA002F954E}' + { + } } } }

1 0

[rharabien] 54684: [SHELL32] - Formatting + some minor changes
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 21:54:04 2011 New Revision: 54684 URL: http://svn.reactos.org/svn/reactos?rev=54684&view=rev Log: [SHELL32] - Formatting + some minor changes Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.cpp trunk/reactos/dll/win32/shell32/folders/fonts.h trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.cpp trunk/reactos/dll/win32/shell32/folders/netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h trunk/reactos/dll/win32/shell32/shlfolder.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde…

1 0

[rharabien] 54683: [SHELL32] - Remove unused/empty files - Improve directory layout
by rharabien＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: rharabien Date: Sun Dec 18 15:47:41 2011 New Revision: 54683 URL: http://svn.reactos.org/svn/reactos?rev=54683&view=rev Log: [SHELL32] - Remove unused/empty files - Improve directory layout Added: trunk/reactos/dll/win32/shell32/TODO.txt (with props) trunk/reactos/dll/win32/shell32/defcontextmenu.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp trunk/reactos/dll/win32/shell32/folders/ (with props) trunk/reactos/dll/win32/shell32/folders/admintools.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp trunk/reactos/dll/win32/shell32/folders/fonts.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_fonts.h trunk/reactos/dll/win32/shell32/folders/fs.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp trunk/reactos/dll/win32/shell32/folders/netplaces.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h trunk/reactos/dll/win32/shell32/newmenu.cpp - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shv_item_new.cpp trunk/reactos/dll/win32/shell32/newmenu.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/shv_item_new.h trunk/reactos/dll/win32/shell32/openwithmenu.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/she_ocmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h - copied unchanged from r54666, trunk/reactos/dll/win32/shell32/she_ocmenu.h trunk/reactos/dll/win32/shell32/systray.cpp - copied unchanged from r54674, trunk/reactos/dll/win32/shell32/ros-systray.cpp Removed: trunk/reactos/dll/win32/shell32/GlueCode.cpp trunk/reactos/dll/win32/shell32/GlueCode.h trunk/reactos/dll/win32/shell32/basebar.cpp trunk/reactos/dll/win32/shell32/basebar.h trunk/reactos/dll/win32/shell32/menuband.cpp trunk/reactos/dll/win32/shell32/menuband.h trunk/reactos/dll/win32/shell32/menubandsite.cpp trunk/reactos/dll/win32/shell32/menubandsite.h trunk/reactos/dll/win32/shell32/menudeskbar.cpp trunk/reactos/dll/win32/shell32/menudeskbar.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/regsvr.cpp trunk/reactos/dll/win32/shell32/ros-systray.cpp trunk/reactos/dll/win32/shell32/she_ocmenu.cpp trunk/reactos/dll/win32/shell32/she_ocmenu.h trunk/reactos/dll/win32/shell32/shell.cpp trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp trunk/reactos/dll/win32/shell32/shfldr_admintools.h trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp trunk/reactos/dll/win32/shell32/shfldr_cpanel.h trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp trunk/reactos/dll/win32/shell32/shfldr_desktop.h trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp trunk/reactos/dll/win32/shell32/shfldr_fonts.h trunk/reactos/dll/win32/shell32/shfldr_fs.cpp trunk/reactos/dll/win32/shell32/shfldr_fs.h trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp trunk/reactos/dll/win32/shell32/shfldr_mycomp.h trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp trunk/reactos/dll/win32/shell32/shfldr_netplaces.h trunk/reactos/dll/win32/shell32/shfldr_printers.cpp trunk/reactos/dll/win32/shell32/shfldr_printers.h trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp trunk/reactos/dll/win32/shell32/shv_item_new.cpp trunk/reactos/dll/win32/shell32/shv_item_new.h trunk/reactos/dll/win32/shell32/toolband.cpp trunk/reactos/dll/win32/shell32/toolband.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/control.cpp trunk/reactos/dll/win32/shell32/cpanel.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Removed: trunk/reactos/dll/win32/shell32/GlueCode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/GlueCode… Removed: trunk/reactos/dll/win32/shell32/GlueCode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/GlueCode… Added: trunk/reactos/dll/win32/shell32/TODO.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/TODO.txt… Removed: trunk/reactos/dll/win32/shell32/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/basebar.… Removed: trunk/reactos/dll/win32/shell32/basebar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/basebar.… Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… Modified: trunk/reactos/dll/win32/shell32/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanel.h… Removed: trunk/reactos/dll/win32/shell32/menuband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menuband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menubandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menubandsite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menuband… Removed: trunk/reactos/dll/win32/shell32/menudeskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menudesk… Removed: trunk/reactos/dll/win32/shell32/menudeskbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/menudesk… Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… Removed: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Removed: trunk/reactos/dll/win32/shell32/regsvr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… Removed: trunk/reactos/dll/win32/shell32/ros-systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/ros-syst… Removed: trunk/reactos/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Removed: trunk/reactos/dll/win32/shell32/she_ocmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… Removed: trunk/reactos/dll/win32/shell32/shell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell.cp… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Removed: trunk/reactos/dll/win32/shell32/shfldr_admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… Removed: trunk/reactos/dll/win32/shell32/shfldr_admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… Removed: trunk/reactos/dll/win32/shell32/shfldr_cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… Removed: trunk/reactos/dll/win32/shell32/shfldr_cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… Removed: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Removed: trunk/reactos/dll/win32/shell32/shfldr_desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… Removed: trunk/reactos/dll/win32/shell32/shfldr_fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… Removed: trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… Removed: trunk/reactos/dll/win32/shell32/shfldr_netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Removed: trunk/reactos/dll/win32/shell32/shfldr_netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_n… Removed: trunk/reactos/dll/win32/shell32/shfldr_printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… Removed: trunk/reactos/dll/win32/shell32/shfldr_printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… Removed: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Removed: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… Removed: trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… Removed: trunk/reactos/dll/win32/shell32/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Removed: trunk/reactos/dll/win32/shell32/shv_item_new.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… Removed: trunk/reactos/dll/win32/shell32/toolband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/toolband… Removed: trunk/reactos/dll/win32/shell32/toolband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/toolband…

1 0

[cgutman] 54682: [NTOSKRNL] - Fix COW file mappings (modifications to the mappings no longer change the file on disk) - Fixes bug #4308
by cgutman＠svn.reactos.org 18 Dec '11

18 Dec '11

Author: cgutman Date: Sun Dec 18 04:55:11 2011 New Revision: 54682 URL: http://svn.reactos.org/svn/reactos?rev=54682&view=rev Log: [NTOSKRNL] - Fix COW file mappings (modifications to the mappings no longer change the file on disk) - Fixes bug #4308 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Dec 18 04:55:11 2011 @@ -3165,7 +3165,7 @@ Segment->Protection = SectionPageProtection; Segment->Flags = MM_DATAFILE_SEGMENT; Segment->Characteristics = 0; - Segment->WriteCopy = FALSE; + Segment->WriteCopy = (SectionPageProtection & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)); if (AllocationAttributes & SEC_RESERVE) { Segment->Length = Segment->RawLength = 0; @@ -4058,6 +4058,23 @@ PMEMORY_AREA MArea; NTSTATUS Status; PHYSICAL_ADDRESS BoundaryAddressMultiple; + + if (Segment->WriteCopy) + { + /* We have to do this because the not present fault + * and access fault handlers depend on the protection + * that should be granted AFTER the COW fault takes + * place to be in Region->Protect. The not present fault + * handler changes this to the correct protection for COW when + * mapping the pages into the process's address space. If a COW + * fault takes place, the access fault handler sets the page protection + * to these values for the newly copied pages + */ + if (Protect == PAGE_WRITECOPY) + Protect = PAGE_READWRITE; + else if (Protect == PAGE_EXECUTE_WRITECOPY) + Protect = PAGE_EXECUTE_READWRITE; + } BoundaryAddressMultiple.QuadPart = 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs