Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[tfaber] 74454: [0.4.5] - Merge Giannis's browseui leak fix from r74441.

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed May 3 11:09:04 2017 New Revision: 74454 URL: http://svn.reactos.org/svn/reactos?rev=74454&view=rev Log: [0.4.5] - Merge Giannis's browseui leak fix from r74441. Modified: branches/ros-branch-0_4_5/ (props changed) branches/ros-branch-0_4_5/reactos/ (props changed) branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.cpp branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.h branches/ros-branch-0_4_5/reactos/dll/win32/browseui/toolsband.cpp Propchange: branches/ros-branch-0_4_5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 3 11:09:04 2017 @@ -1,2 +1,2 @@ /branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 -/trunk:74437 +/trunk:74437,74441 Propchange: branches/ros-branch-0_4_5/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 3 11:09:04 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74437 +/trunk/reactos:74437,74441 Modified: branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed May 3 11:09:04 2017 @@ -205,6 +205,12 @@ if (fAddressEditBox) fAddressEditBox.Release(); if (fSite) fSite.Release(); + if (m_himlNormal) + ImageList_Destroy(m_himlNormal); + + if (m_himlHot) + ImageList_Destroy(m_himlHot); + return S_OK; } @@ -521,15 +527,12 @@ void CAddressBand::CreateGoButton() { const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; HINSTANCE shellInstance; - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | @@ -538,10 +541,10 @@ 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + if (m_himlNormal) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(m_himlNormal)); + if (m_himlHot) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(m_himlHot)); SendMessage(fGoButton, TB_ADDSTRINGW, reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); Modified: branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Wed May 3 11:09:04 2017 @@ -41,6 +41,9 @@ HWND fGoButton; HWND fComboBox; bool fGoButtonShown; + HIMAGELIST m_himlNormal; + HIMAGELIST m_himlHot; + public: CAddressBand(); virtual ~CAddressBand(); Modified: branches/ros-branch-0_4_5/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_5/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed May 3 11:09:04 2017 @@ -40,6 +40,8 @@ CComPtr<IDockingWindowSite> fDockSite; GUID fExecCommandCategory; CComPtr<IOleCommandTarget> fExecCommandTarget; + HIMAGELIST m_himlNormal; + HIMAGELIST m_himlHot; public: CToolsBand(); virtual ~CToolsBand(); @@ -294,36 +296,16 @@ SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - HBITMAP imgNormal = reinterpret_cast<HBITMAP>( - LoadImage(shell32Instance, MAKEINTRESOURCE(214), - IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - - HBITMAP imgHot = reinterpret_cast<HBITMAP>( - LoadImage(shell32Instance, MAKEINTRESOURCE(215), - IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - - if (imgNormal && imgHot) - { - BITMAP bitmapInfo; - GetObjectW(imgNormal, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST himlNormal = ImageList_Create(bitmapInfo.bmHeight, bitmapInfo.bmHeight, ILC_COLOR32, 4, 4); - ImageList_Add(himlNormal, imgNormal, NULL); - - GetObjectW(imgHot, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST himlHot = ImageList_Create(bitmapInfo.bmHeight, bitmapInfo.bmHeight, ILC_COLOR32, 4, 4); - ImageList_Add(himlHot, imgHot, NULL); - - SendMessage(TB_SETIMAGELIST, 0, (LPARAM) himlNormal); - SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) himlHot); - } - + m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); + SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot); SendMessage(TB_ADDBUTTONSW, numShownButtons, (LPARAM)&tbButtonsAdd); - if (imgNormal) - DeleteObject(imgNormal); - if (imgHot) - DeleteObject(imgHot); - return hResult; } @@ -344,7 +326,6 @@ HRESULT STDMETHODCALLTYPE CToolsBand::ContextSensitiveHelp(BOOL fEnterMode) { - return E_NOTIMPL; } @@ -357,7 +338,14 @@ m_hWnd = NULL; - if (fDockSite) fDockSite.Release(); + if (fDockSite) + fDockSite.Release(); + + if (m_himlNormal) + ImageList_Destroy(m_himlNormal); + + if (m_himlHot) + ImageList_Destroy(m_himlHot); return S_OK; }

7 years, 7 months

[tfaber] 74453: [0.4.5] - Merge Giannis's explorer leak fix from r74437. CORE-13155

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed May 3 11:06:04 2017 New Revision: 74453 URL: http://svn.reactos.org/svn/reactos?rev=74453&view=rev Log: [0.4.5] - Merge Giannis's explorer leak fix from r74437. CORE-13155 Modified: branches/ros-branch-0_4_5/ (props changed) branches/ros-branch-0_4_5/reactos/ (props changed) branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp branches/ros-branch-0_4_5/rosapps/applications/cmdutils/cat/ (props changed) branches/ros-branch-0_4_5/rosapps/applications/imagesoft/lang/no-NO.rc (props changed) branches/ros-branch-0_4_5/rosapps/applications/net/roshttpd/ (props changed) branches/ros-branch-0_4_5/rosapps/applications/sysutils/gettype/ (props changed) branches/ros-branch-0_4_5/rosapps/applications/sysutils/logevent/ (props changed) branches/ros-branch-0_4_5/rosapps/applications/sysutils/screenshot/ (props changed) branches/ros-branch-0_4_5/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed) Propchange: branches/ros-branch-0_4_5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 3 11:06:04 2017 @@ -1 +1,2 @@ /branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 +/trunk:74437 Propchange: branches/ros-branch-0_4_5/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 3 11:06:04 2017 @@ -23,3 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:74437 Modified: branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed May 3 11:06:04 2017 @@ -714,19 +714,18 @@ 0, TMT_TEXTCOLOR, &textColor); + + if (this->hFont != NULL) + DeleteObject(this->hFont); + + SetFont(hFont, FALSE); } else { - NONCLIENTMETRICS ncm = { 0 }; - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE); - - hFont = CreateFontIndirectW(&ncm.lfMessageFont); - + /* We don't need to set a font here, our parent will use + * WM_SETFONT to set the right one when themes are not enabled. */ textColor = RGB(0, 0, 0); } - - SetFont(hFont, FALSE); CloseThemeData(clockTheme); Propchange: branches/ros-branch-0_4_5/rosapps/applications/cmdutils/cat/ ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/applications/imagesoft/lang/no-NO.rc ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/applications/net/roshttpd/ ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/gettype/ ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/logevent/ ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/applications/sysutils/screenshot/ ------------------------------------------------------------------------------ (empty) Propchange: branches/ros-branch-0_4_5/rosapps/templates/old_wordpad/lang/no-NO.rc ------------------------------------------------------------------------------ (empty)

7 years, 7 months

[gadamopoulos] 74452: [GDI32] -Add a public undocgdi.h file to keep the definitions for undocumented exports. For now it only contains GdiDrawStream.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed May 3 10:55:54 2017 New Revision: 74452 URL: http://svn.reactos.org/svn/reactos?rev=74452&view=rev Log: [GDI32] -Add a public undocgdi.h file to keep the definitions for undocumented exports. For now it only contains GdiDrawStream. Added: trunk/reactos/sdk/include/reactos/undocgdi.h (with props) Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h trunk/reactos/win32ss/gdi/gdi32/misc/misc.c Added: trunk/reactos/sdk/include/reactos/undocgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocg… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocgdi.h (added) +++ trunk/reactos/sdk/include/reactos/undocgdi.h [iso-8859-1] Wed May 3 10:55:54 2017 @@ -0,0 +1,33 @@ + +#ifndef _UNDOCGDI_H +#define _UNDOCGDI_H + +#define DS_TILE 0x2 +#define DS_TRANSPARENTALPHA 0x4 +#define DS_TRANSPARENTCLR 0x8 +#define DS_TRUESIZE 0x20 + +typedef struct GDI_DRAW_STREAM_TAG +{ + DWORD signature; // must be 0x44727753;//"Swrd" + DWORD reserved; // must be 0 + HDC hDC; // handle to the device object of windiw to draw. + RECT rcDest; // desination rect of dc to draw. + DWORD unknown1; // must be 1. + HBITMAP hImage; + DWORD unknown2; // must be 9. + RECT rcClip; + RECT rcSrc; // source rect of bitmap to draw. + DWORD drawOption; // DS_ flags + DWORD leftSizingMargin; + DWORD rightSizingMargin; + DWORD topSizingMargin; + DWORD bottomSizingMargin; + DWORD crTransparent; // transparent color. +} GDI_DRAW_STREAM, *PGDI_DRAW_STREAM; + +BOOL +WINAPI +GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); + +#endif Propchange: trunk/reactos/sdk/include/reactos/undocgdi.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Wed May 3 10:55:54 2017 @@ -56,4 +56,6 @@ /* Deprecated NTGDI calls which shouldn't exist */ #include <ntgdibad.h> +#include <undocgdi.h> + #endif /* _GDI32_PCH_ */ Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Wed May 3 10:55:54 2017 @@ -282,26 +282,6 @@ int cyTopHeight; int cyBottomHeight; } MARGINS, *PMARGINS; - -typedef struct GDI_DRAW_STREAM_TAG -{ - DWORD signature; // must be 0x44727753;//"Swrd" - DWORD reserved; // must be 0 - HDC hDC; // handle to the device object of windiw to draw. - RECT rcDest; // desination rect of window to draw. - DWORD unknown1; // must be 1. - HBITMAP hImage; - DWORD unknown2; // must be 9. - RECT rcClip; // desination rect of window to draw. - RECT rcSrc; // source rect of bitmap to draw. - DWORD drawOption; // 0x2 is tile instead of stretch. 0x4 is transparent. 0x20 is true size - DWORD leftSizingMargin; - DWORD rightSizingMargin; - DWORD topSizingMargin; - DWORD bottomSizingMargin; - DWORD crTransparent; // transparent color. - -} GDI_DRAW_STREAM, *PGDI_DRAW_STREAM; enum SIZINGTYPE { ST_TRUESIZE = 0, @@ -683,16 +663,16 @@ INT transparent = 0; int sizingtype; - if (pDS->drawOption & 0x4) + if (pDS->drawOption & DS_TRANSPARENTALPHA) transparent = ALPHABLEND_FULL; - else if (pDS->drawOption & 0x8) + else if (pDS->drawOption & DS_TRANSPARENTCLR) transparent = ALPHABLEND_BINARY; else transparent = ALPHABLEND_NONE; - if (pDS->drawOption & 0x2) + if (pDS->drawOption & DS_TILE) sizingtype = ST_TILE; - else if (pDS->drawOption & 0x20) + else if (pDS->drawOption & DS_TRUESIZE) sizingtype = ST_TRUESIZE; else sizingtype = ST_STRETCH;

7 years, 7 months

[pschweitzer] 74451: [NTOSKNRL] Misc fixes in NtQueryDirectoryFile(): - Don't leak auxbuffer - Don't allow two completion routines

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue May 2 21:32:20 2017 New Revision: 74451 URL: http://svn.reactos.org/svn/reactos?rev=74451&view=rev Log: [NTOSKNRL] Misc fixes in NtQueryDirectoryFile(): - Don't leak auxbuffer - Don't allow two completion routines Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Tue May 2 21:32:20 2017 @@ -1901,6 +1901,14 @@ return Status; } + /* Are there two associated completion routines? */ + if (FileObject->CompletionContext != NULL && ApcRoutine != NULL) + { + ObDereferenceObject(FileObject); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); + return STATUS_INVALID_PARAMETER; + } + /* Check if we have an even handle */ if (EventHandle) { @@ -1914,6 +1922,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); ObDereferenceObject(FileObject); return Status; }

7 years, 7 months

[tfaber] 74450: [FASTFAT] - Add support for FILE_DELETE_ON_CLOSE CORE-6931 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 2 19:33:14 2017 New Revision: 74450 URL: http://svn.reactos.org/svn/reactos?rev=74450&view=rev Log: [FASTFAT] - Add support for FILE_DELETE_ON_CLOSE CORE-6931 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Tue May 2 19:33:14 2017 @@ -24,6 +24,7 @@ PVFAT_IRP_CONTEXT IrpContext) { PVFATFCB pFcb; + PVFATCCB pCcb; PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; PFILE_OBJECT FileObject = IrpContext->FileObject; @@ -56,6 +57,12 @@ { ExReleaseResourceLite(&pFcb->MainResource); return STATUS_PENDING; + } + + pCcb = FileObject->FsContext2; + if (BooleanFlagOn(pCcb->Flags, CCB_DELETE_ON_CLOSE)) + { + pFcb->Flags |= FCB_DELETE_PENDING; } /* Notify about the cleanup */ Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue May 2 19:33:14 2017 @@ -394,6 +394,7 @@ ULONG RequestedDisposition, RequestedOptions; PVFATFCB pFcb = NULL; PVFATFCB ParentFcb = NULL; + PVFATCCB pCcb = NULL; PWCHAR c, last; BOOLEAN PagingFileCreate; BOOLEAN Dots; @@ -657,6 +658,12 @@ } } + pCcb = FileObject->FsContext2; + if (BooleanFlagOn(RequestedOptions, FILE_DELETE_ON_CLOSE)) + { + pCcb->Flags |= CCB_DELETE_ON_CLOSE; + } + pFcb->OpenHandleCount++; DeviceExt->OpenHandleCount++; } @@ -904,6 +911,12 @@ { IoUpdateShareAccess(FileObject, &pFcb->FCBShareAccess); + } + + pCcb = FileObject->FsContext2; + if (BooleanFlagOn(RequestedOptions, FILE_DELETE_ON_CLOSE)) + { + pCcb->Flags |= CCB_DELETE_ON_CLOSE; } if (Irp->IoStatus.Information == FILE_CREATED) Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Tue May 2 19:33:14 2017 @@ -486,9 +486,12 @@ ULONG LastOffset; } VFATFCB, *PVFATFCB; +#define CCB_DELETE_ON_CLOSE 0x0001 + typedef struct _VFATCCB { LARGE_INTEGER CurrentByteOffset; + ULONG Flags; /* for DirectoryControl */ ULONG Entry; /* for DirectoryControl */

7 years, 7 months

[tfaber] 74449: [NTOS:MM] - Avoid a file object reference leak in MmCreateSection. CORE-6931

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 2 17:18:37 2017 New Revision: 74449 URL: http://svn.reactos.org/svn/reactos?rev=74449&view=rev Log: [NTOS:MM] - Avoid a file object reference leak in MmCreateSection. CORE-6931 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] Tue May 2 17:18:37 2017 @@ -5161,6 +5161,8 @@ MaximumSize, SectionPageProtection, AllocationAttributes); + if (FileObject) + ObDereferenceObject(FileObject); } return Status;

7 years, 7 months

[gadamopoulos] 74448: [SHELL32] -CDefView: Hide the drag image at drop.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue May 2 14:01:07 2017 New Revision: 74448 URL: http://svn.reactos.org/svn/reactos?rev=74448&view=rev Log: [SHELL32] -CDefView: Hide the drag image at drop. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Tue May 2 14:01:07 2017 @@ -2986,6 +2986,7 @@ { ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); + ImageList_DragLeave(m_hWnd); ImageList_EndDrag(); if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) &&

7 years, 7 months

[tfaber] 74447: [NTOS:MM] - When mapping a view of the physical memory section, don't check for BaseAddress/SectionOffset alignment. Instead, prevent user mode mappings of views beyond the highest ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 2 11:11:39 2017 New Revision: 74447 URL: http://svn.reactos.org/svn/reactos?rev=74447&view=rev Log: [NTOS:MM] - When mapping a view of the physical memory section, don't check for BaseAddress/SectionOffset alignment. Instead, prevent user mode mappings of views beyond the highest physical page. Fixes flakiness in kmtest:MmSection CORE-13113 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue May 2 11:11:39 2017 @@ -3689,24 +3689,36 @@ return Status; } - if (!(AllocationType & MEM_DOS_LIM)) + if (MiIsRosSectionObject(Section) && + (Section->AllocationAttributes & SEC_PHYSICALMEMORY)) + { + if (PreviousMode == UserMode && + SafeSectionOffset.QuadPart + SafeViewSize > MmHighestPhysicalPage << PAGE_SHIFT) + { + DPRINT1("Denying map past highest physical page.\n"); + ObDereferenceObject(Section); + ObDereferenceObject(Process); + return STATUS_INVALID_PARAMETER_6; + } + } + else if (!(AllocationType & MEM_DOS_LIM)) { /* Check for non-allocation-granularity-aligned BaseAddress */ if (SafeBaseAddress != ALIGN_DOWN_POINTER_BY(SafeBaseAddress, MM_VIRTMEM_GRANULARITY)) { - DPRINT("BaseAddress is not at 64-kilobyte address boundary."); - ObDereferenceObject(Section); - ObDereferenceObject(Process); - return STATUS_MAPPED_ALIGNMENT; + DPRINT("BaseAddress is not at 64-kilobyte address boundary.\n"); + ObDereferenceObject(Section); + ObDereferenceObject(Process); + return STATUS_MAPPED_ALIGNMENT; } /* Do the same for the section offset */ if (SafeSectionOffset.LowPart != ALIGN_DOWN_BY(SafeSectionOffset.LowPart, MM_VIRTMEM_GRANULARITY)) { - DPRINT("SectionOffset is not at 64-kilobyte address boundary."); - ObDereferenceObject(Section); - ObDereferenceObject(Process); - return STATUS_MAPPED_ALIGNMENT; + DPRINT("SectionOffset is not at 64-kilobyte address boundary.\n"); + ObDereferenceObject(Section); + ObDereferenceObject(Process); + return STATUS_MAPPED_ALIGNMENT; } }

7 years, 7 months

[tfaber] 74446: [KMTESTS:MM] Add some more tests for physical memory sections: - Show that any alignment for SectionOffset/ViewSize is allowed. It will get automatically fixed up to page alignment ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 2 09:02:10 2017 New Revision: 74446 URL: http://svn.reactos.org/svn/reactos?rev=74446&view=rev Log: [KMTESTS:MM] Add some more tests for physical memory sections: - Show that any alignment for SectionOffset/ViewSize is allowed. It will get automatically fixed up to page alignment - Show that kernel mode can map views beyond the highest physical page, but user mode cannot CORE-13113 Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Tue May 2 09:02:10 2017 @@ -409,10 +409,20 @@ PHYSICAL_ADDRESS MyPagePhysical; PUCHAR ZeroPageContents; PHYSICAL_ADDRESS ZeroPagePhysical; + PHYSICAL_ADDRESS PhysicalAddress; PVOID Mapping; + SYSTEM_BASIC_INFORMATION BasicInfo; PUCHAR MappingBytes; SIZE_T ViewSize; SIZE_T EqualBytes; + struct + { + PVOID Mapping; + PHYSICAL_ADDRESS PhysicalAddress; + SIZE_T ViewSize; + } *UserStruct; + PVOID UserMem; + SIZE_T UserSize; MyPage = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, 'MPmK'); if (skip(MyPage != NULL, "Out of memory\n")) @@ -444,7 +454,7 @@ InitializeObjectAttributes(&ObjectAttributes, &SectionName, - OBJ_KERNEL_HANDLE, + 0, NULL, NULL); Status = ZwOpenSection(&SectionHandle, SECTION_ALL_ACCESS, &ObjectAttributes); @@ -539,7 +549,208 @@ ok_eq_hex(Status, STATUS_SUCCESS); } - Status = ZwClose(SectionHandle); + /* Unaligned mapping will get aligned automatically */ + Mapping = NULL; + ViewSize = PAGE_SIZE - 4; + PhysicalAddress.QuadPart = MyPagePhysical.QuadPart + 4; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &PhysicalAddress, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No view\n")) + { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); + ok(((ULONG_PTR)Mapping % PAGE_SIZE) == 0, "Mapping = %p\n", Mapping); + ok_eq_ulong(ViewSize, PAGE_SIZE); + + EqualBytes = RtlCompareMemory(Mapping, + MyPage, + PAGE_SIZE); + ok_eq_size(EqualBytes, PAGE_SIZE); + + Status = ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* The following tests need to pass parameters in user mode */ + UserStruct = NULL; + UserMem = NULL; + UserSize = PAGE_SIZE; + Status = ZwAllocateVirtualMemory(ZwCurrentProcess(), + &UserMem, + 0, + &UserSize, + MEM_COMMIT, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + UserStruct = UserMem; + + /* Find highest physical page -- only kernel can map beyond this */ + Status = ZwQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + trace("HighestPhysicalPageNumber: %lx\n", BasicInfo.HighestPhysicalPageNumber); + + /* Start one page before highest physical -- succeeds for user/kernel */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + PhysicalAddress.QuadPart = (ULONGLONG)(BasicInfo.HighestPhysicalPageNumber - 1) << PAGE_SHIFT; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &PhysicalAddress, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + + /* Repeat from user mode */ + if (!skip(UserStruct != NULL, "No user memory\n")) + { + KmtStartSeh() + UserStruct->Mapping = NULL; + UserStruct->PhysicalAddress.QuadPart = PhysicalAddress.QuadPart; + UserStruct->ViewSize = PAGE_SIZE; + KmtEndSeh(STATUS_SUCCESS); + + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &UserStruct->Mapping, + 0, + 0, + &UserStruct->PhysicalAddress, + &UserStruct->ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + KmtStartSeh() + ZwUnmapViewOfSection(ZwCurrentProcess(), UserStruct->Mapping); + KmtEndSeh(STATUS_SUCCESS); + } + } + + /* Now start at highest physical -- fails for user */ + Mapping = NULL; + ViewSize = PAGE_SIZE; + PhysicalAddress.QuadPart = (ULONGLONG)BasicInfo.HighestPhysicalPageNumber << PAGE_SHIFT; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &PhysicalAddress, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + + /* Repeat from user mode */ + if (!skip(UserStruct != NULL, "No user memory\n")) + { + KmtStartSeh() + UserStruct->Mapping = NULL; + UserStruct->PhysicalAddress.QuadPart = PhysicalAddress.QuadPart; + UserStruct->ViewSize = PAGE_SIZE; + KmtEndSeh(STATUS_SUCCESS); + + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &UserStruct->Mapping, + 0, + 0, + &UserStruct->PhysicalAddress, + &UserStruct->ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + { + KmtStartSeh() + ZwUnmapViewOfSection(ZwCurrentProcess(), UserStruct->Mapping); + KmtEndSeh(STATUS_SUCCESS); + } + } + + /* End of view crosses highest physical -- fails for user */ + Mapping = NULL; + ViewSize = 2 * PAGE_SIZE; + PhysicalAddress.QuadPart = (ULONGLONG)(BasicInfo.HighestPhysicalPageNumber - 1) << PAGE_SHIFT; + Status = ZwMapViewOfSection(SectionHandle, + ZwCurrentProcess(), + &Mapping, + 0, + 0, + &PhysicalAddress, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + ZwUnmapViewOfSection(ZwCurrentProcess(), Mapping); + + /* Repeat from user mode */ + if (!skip(UserStruct != NULL, "No user memory\n")) + { + KmtStartSeh() + UserStruct->Mapping = NULL; + UserStruct->PhysicalAddress.QuadPart = PhysicalAddress.QuadPart; + UserStruct->ViewSize = 2 * PAGE_SIZE; + KmtEndSeh(STATUS_SUCCESS); + + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &UserStruct->Mapping, + 0, + 0, + &UserStruct->PhysicalAddress, + &UserStruct->ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER_6); + if (NT_SUCCESS(Status)) + { + KmtStartSeh() + ZwUnmapViewOfSection(ZwCurrentProcess(), UserStruct->Mapping); + KmtEndSeh(STATUS_SUCCESS); + } + } + + /* Free user memory and close section */ + if (!skip(UserStruct != NULL, "No user memory\n")) + { + UserSize = 0; + Status = ZwFreeVirtualMemory(ZwCurrentProcess(), + &UserMem, + &UserSize, + MEM_RELEASE); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + Status = ObCloseHandle(SectionHandle, UserMode); ok_eq_hex(Status, STATUS_SUCCESS); }

7 years, 7 months

[tfaber] 74445: [NTOS:IO] - Print the error status and message in IoRaiseInformationalHardError CORE-13174 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue May 2 08:18:30 2017 New Revision: 74445 URL: http://svn.reactos.org/svn/reactos?rev=74445&view=rev Log: [NTOS:IO] - Print the error status and message in IoRaiseInformationalHardError CORE-13174 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Tue May 2 08:18:30 2017 @@ -695,7 +695,7 @@ IN PUNICODE_STRING String, IN PKTHREAD Thread) { - UNIMPLEMENTED; + DPRINT1("IoRaiseInformationalHardError: %lx, %wZ\n", ErrorStatus, String); return FALSE; }

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017