ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2015
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
347 discussions
Start a n
N
ew thread
[gadamopoulos] 69647: [SHELL32] - Add DoDeleteAsync method that takes the data object and the fMask parameter from IContextMenu in order to distinguish if we need a permanent delete. - CDefView: Pr...
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Thu Oct 22 15:23:21 2015 New Revision: 69647 URL:
http://svn.reactos.org/svn/reactos?rev=69647&view=rev
Log: [SHELL32] - Add DoDeleteAsync method that takes the data object and the fMask parameter from IContextMenu in order to distinguish if we need a permanent delete. - CDefView: Properly add CMIC_MASK_SHIFT_DOWN and CMIC_MASK_CONTROL_DOWN flags when calling Invoke. - CDefaultContextMenu: use DoDeleteAsync and pass fmask so as to make Shift+Delete shortcut to permanently delete files. Note: GetKeyState sometimes returns wrong results but this doesn't concern the shell. CORE-4365 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h 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] Thu Oct 22 15:23:21 2015 @@ -151,6 +151,7 @@ void OnDeactivate(); void DoActivate(UINT uState); HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + HRESULT InvokeContextMenuCommand(UINT uCommand); LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection); // *** IOleWindow methods *** @@ -1250,13 +1251,30 @@ return m_cidl; } +HRESULT CDefView::InvokeContextMenuCommand(UINT uCommand) +{ + CMINVOKECOMMANDINFO cmi; + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + + if (GetKeyState(VK_SHIFT) & 0x8000) + cmi.fMask |= CMIC_MASK_SHIFT_DOWN; + + if (GetKeyState(VK_CONTROL) & 0x8000) + cmi.fMask |= CMIC_MASK_CONTROL_DOWN; + + return m_pCM->InvokeCommand(&cmi); +} + /********************************************************** * ShellView_OpenSelectedItems() */ HRESULT CDefView::OpenSelectedItems() { HMENU hMenu; - CMINVOKECOMMANDINFO cmi; UINT uCommand; HRESULT hResult; @@ -1287,12 +1305,7 @@ goto cleanup; } - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - - hResult = m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: @@ -1314,7 +1327,6 @@ WORD y; UINT uCommand; HMENU hMenu; - CMINVOKECOMMANDINFO cmi; HRESULT hResult; // for some reason I haven't figured out, we sometimes recurse into this method @@ -1339,9 +1351,6 @@ hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (FAILED( hResult)) goto cleanup; - - if (m_FolderSettings.fFlags & FWF_DESKTOP) - SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); uCommand = TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, @@ -1352,14 +1361,9 @@ if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) goto cleanup; - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: - if (m_pCM) m_pCM.Release(); @@ -1372,7 +1376,6 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) { HRESULT hResult; - CMINVOKECOMMANDINFO cmi; HMENU hMenu; hMenu = CreatePopupMenu(); @@ -1387,14 +1390,9 @@ if (FAILED( hResult)) goto cleanup; - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); - cmi.hwnd = m_hWnd; - m_pCM->InvokeCommand(&cmi); + InvokeContextMenuCommand(uCommand); cleanup: - if (m_pCM) m_pCM.Release(); Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault…
============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -1165,19 +1165,9 @@ return S_OK; } -HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) { - TRACE("(%p) Deleting\n", this); - - CComPtr<IDataObject> pDataObject; - - if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObject)))) - { - IStream *s; - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); - SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); - } - else - return E_FAIL; +HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) +{ + DoDeleteAsync(m_pDataObj, lpcmi->fMask); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -1030,10 +1030,14 @@ InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */ - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) { - IStream *s; - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); - SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); + if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) + { + DWORD fMask = 0; + + if ((dwKeyState & MK_SHIFT) == MK_SHIFT) + fMask |= CMIC_MASK_SHIFT_DOWN; + + DoDeleteAsync(pDataObject, fMask); } else { @@ -1045,20 +1049,7 @@ return S_OK; } -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) -{ - CoInitialize(NULL); - CComPtr<IDataObject> pDataObject; - HRESULT hr = CoGetInterfaceAndReleaseStream (static_cast<IStream*>(lpParameter), IID_PPV_ARG(IDataObject, &pDataObject)); - if (SUCCEEDED(hr)) - { - DoDeleteDataObject(pDataObject); - } - CoUninitialize(); - return 0; -} - -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda) +HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask) { TRACE("performing delete"); HRESULT hr; @@ -1160,7 +1151,8 @@ ZeroMemory(&FileOp, sizeof(FileOp)); FileOp.wFunc = FO_DELETE; FileOp.pFrom = pwszPaths; - FileOp.fFlags = FOF_ALLOWUNDO; + if ((fMask & CMIC_MASK_SHIFT_DOWN) == 0) + FileOp.fFlags = FOF_ALLOWUNDO; if (SHFileOperationW(&FileOp) != 0) { @@ -1174,6 +1166,35 @@ ReleaseStgMedium(&medium); return hr; +} + +struct DeleteThreadData { + IStream *s; + DWORD fMask; +}; + +DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) +{ + DeleteThreadData *data = static_cast<DeleteThreadData*>(lpParameter); + CoInitialize(NULL); + IDataObject *pDataObject; + HRESULT hr = CoGetInterfaceAndReleaseStream (data->s, IID_PPV_ARG(IDataObject, &pDataObject)); + if (SUCCEEDED(hr)) + { + DoDeleteDataObject(pDataObject, data->fMask); + } + pDataObject->Release(); + CoUninitialize(); + HeapFree(GetProcessHeap(), 0, data); + return 0; +} + +void DoDeleteAsync(IDataObject *pda, DWORD fMask) +{ + DeleteThreadData *data = static_cast<DeleteThreadData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(DeleteThreadData))); + data->fMask = fMask; + CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pda, &data->s); + SHCreateThread(DoDeleteThreadProc, data, NULL, NULL); } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.h [iso-8859-1] Thu Oct 22 15:23:21 2015 @@ -22,8 +22,7 @@ #ifndef _SHFLDR_RECYCLEBIN_H_ #define _SHFLDR_RECYCLEBIN_H_ -DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter); -HRESULT WINAPI DoDeleteDataObject(IDataObject *pda); +void DoDeleteAsync(IDataObject *pda, DWORD fMask); BOOL TRASH_CanTrashFile(LPCWSTR wszPath); BOOL TRASH_TrashFile(LPCWSTR wszPath);
9 years, 2 months
1
0
0
0
[tfaber] 69646: [WIN32K:NTUSER] - Don't pass an uninitialized DOSENDMESSAGE structure to co_IntDoSendMessage. CID 701425
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 15:12:09 2015 New Revision: 69646 URL:
http://svn.reactos.org/svn/reactos?rev=69646&view=rev
Log: [WIN32K:NTUSER] - Don't pass an uninitialized DOSENDMESSAGE structure to co_IntDoSendMessage. CID 701425 Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag…
============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Oct 22 15:12:09 2015 @@ -2760,7 +2760,7 @@ _SEH2_END; } - Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, &dsm ); + Ret = co_IntDoSendMessage( hWnd, Msg, wParam, lParam, pdsm ? &dsm : NULL ); if (pdsm) {
9 years, 2 months
1
0
0
0
[tfaber] 69645: [WIN32K:NTUSER] - Only resend WM_ENTERIDLE after encountering a relevant message. CID 1321906
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 14:43:39 2015 New Revision: 69645 URL:
http://svn.reactos.org/svn/reactos?rev=69645&view=rev
Log: [WIN32K:NTUSER] - Only resend WM_ENTERIDLE after encountering a relevant message. CID 1321906 Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c…
============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Oct 22 14:43:39 2015 @@ -3906,7 +3906,7 @@ IntTranslateKbdMessage(&msg, 0); mt.Pt = msg.pt; - if ( (msg.hwnd == mt.CurrentMenu->hWnd) || ((msg.message!=WM_TIMER) || (msg.message!=WM_SYSTIMER)) ) + if ( (msg.hwnd == mt.CurrentMenu->hWnd) || ((msg.message!=WM_TIMER) && (msg.message!=WM_SYSTIMER)) ) enterIdleSent=FALSE; fRemove = FALSE;
9 years, 2 months
1
0
0
0
[tfaber] 69644: [WIN32K:NTUSER] - Don't call PopupMenuWndProc for the message window in IntDispatchMessage. CID 1322026
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 14:13:40 2015 New Revision: 69644 URL:
http://svn.reactos.org/svn/reactos?rev=69644&view=rev
Log: [WIN32K:NTUSER] - Don't call PopupMenuWndProc for the message window in IntDispatchMessage. CID 1322026 Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag…
============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Oct 22 14:13:40 2015 @@ -750,6 +750,7 @@ pMsg->wParam, pMsg->lParam, &retval); + break; case FNID_MENU: DoCallBack = !PopupMenuWndProc( Window, pMsg->message,
9 years, 2 months
1
0
0
0
[tfaber] 69643: [WIN32K:NTGDI] - Fix pool leak in failure case of PATH_StrokePath. CID 716633
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 13:48:12 2015 New Revision: 69643 URL:
http://svn.reactos.org/svn/reactos?rev=69643&view=rev
Log: [WIN32K:NTGDI] - Fix pool leak in failure case of PATH_StrokePath. CID 716633 Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Thu Oct 22 13:48:12 2015 @@ -1644,6 +1644,7 @@ if (!Realloc) { DPRINT1("Can't allocate pool!\n"); + ExFreePoolWithTag(pBzrPts, TAG_BEZIER); goto end; }
9 years, 2 months
1
0
0
0
[tfaber] 69642: [WIN32K:NTGDI] - Correctly pass 'planes' and 'bpp' arguments to IntCreateDIBitmap in GreCreateDIBitmapInternal. CID 1250302
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 11:29:55 2015 New Revision: 69642 URL:
http://svn.reactos.org/svn/reactos?rev=69642&view=rev
Log: [WIN32K:NTGDI] - Correctly pass 'planes' and 'bpp' arguments to IntCreateDIBitmap in GreCreateDIBitmapInternal. CID 1250302 Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Oct 22 11:29:55 2015 @@ -1529,7 +1529,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, planes, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)
9 years, 2 months
1
0
0
0
[tfaber] 69641: [WIN32K:NTGDI] - Fix pool leak in failure case (CID 1322140) and don't treat NTSTATUS values as Win32 errors in NtGdiGetGlyphIndicesW.
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 11:05:59 2015 New Revision: 69641 URL:
http://svn.reactos.org/svn/reactos?rev=69641&view=rev
Log: [WIN32K:NTGDI] - Fix pool leak in failure case (CID 1322140) and don't treat NTSTATUS values as Win32 errors in NtGdiGetGlyphIndicesW. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype…
============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Oct 22 11:05:59 2015 @@ -4519,7 +4519,7 @@ potm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); if (!potm) { - Status = ERROR_NOT_ENOUGH_MEMORY; + Status = STATUS_NO_MEMORY; goto ErrorRet; } IntGetOutlineTextMetrics(FontGDI, Size, potm); @@ -4532,8 +4532,8 @@ if (!Safepwc) { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return GDI_ERROR; + Status = STATUS_NO_MEMORY; + goto ErrorRet; } _SEH2_TRY @@ -4587,7 +4587,7 @@ ExFreePoolWithTag(Safepwc, GDITAG_TEXT); } if (NT_SUCCESS(Status)) return cwc; - EngSetLastError(Status); + SetLastNtError(Status); return GDI_ERROR; }
9 years, 2 months
1
0
0
0
[tfaber] 69640: [WIN32K:ENG] - Remove useless NULL checks in BltMask and IntEngStretchBlt. CID 1322184, 701344
by tfaber@svn.reactos.org
Author: tfaber Date: Thu Oct 22 10:46:02 2015 New Revision: 69640 URL:
http://svn.reactos.org/svn/reactos?rev=69640&view=rev
Log: [WIN32K:ENG] - Remove useless NULL checks in BltMask and IntEngStretchBlt. CID 1322184, 701344 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/stretchblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Thu Oct 22 10:46:02 2015 @@ -66,8 +66,6 @@ ASSERT(IS_VALID_ROP4(Rop4)); ASSERT(psoMask->iBitmapFormat == BMF_1BPP); - - if (!psoMask) return FALSE; fgndRop = ROP4_FGND(Rop4); bkgndRop = ROP4_BKGND(Rop4); Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stretchblt…
============================================================================== --- trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] Thu Oct 22 10:46:02 2015 @@ -386,7 +386,7 @@ ASSERT(psoDest); //ASSERT(psoSource); // FIXME! ASSERT(DestRect); - //ASSERT(SourceRect); // FIXME! + ASSERT(SourceRect); //ASSERT(!RECTL_bIsEmptyRect(SourceRect)); // FIXME! /* If no clip object is given, use trivial one */ @@ -427,7 +427,7 @@ InputClippedRect.bottom = DestRect->top; } - if (NULL == SourceRect || NULL == psoSource) + if (NULL == psoSource) { return FALSE; }
9 years, 2 months
1
0
0
0
[jimtabor] 69639: [Win32k] - Fix flashing windows and cleanup code. See CORE-10384.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Thu Oct 22 09:05:56 2015 New Revision: 69639 URL:
http://svn.reactos.org/svn/reactos?rev=69639&view=rev
Log: [Win32k] - Fix flashing windows and cleanup code. See CORE-10384. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti…
============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Oct 22 09:05:56 2015 @@ -1327,7 +1327,7 @@ // Set previous window state. Ret = !!(FlashState & FLASHW_ACTIVE); - if ( pfwi->dwFlags & FLASHW_TIMERNOFG && + if ( (pfwi->dwFlags & FLASHW_TIMERNOFG) == FLASHW_TIMERNOFG && gpqForeground == pWnd->head.pti->MessageQueue ) { // Flashing until foreground, set this to Stop. @@ -1636,30 +1636,27 @@ { PWND pWnd; FLASHWINFO finfo = {0}; - BOOL Ret = TRUE; + BOOL Ret = FALSE; UserEnterExclusive(); _SEH2_TRY { - ProbeForRead(pfwi, sizeof(FLASHWINFO), sizeof(ULONG)); + ProbeForRead(pfwi, sizeof(FLASHWINFO), 1); RtlCopyMemory(&finfo, pfwi, sizeof(FLASHWINFO)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; + _SEH2_YIELD(goto Exit); } _SEH2_END - if (!Ret) goto Exit; - - if (!( pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, TYPE_WINDOW)) || + if (!( pWnd = ValidateHwndNoErr(finfo.hwnd)) || finfo.cbSize != sizeof(FLASHWINFO) || finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) { EngSetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; goto Exit; }
9 years, 2 months
1
0
0
0
[hbelusca] 69638: [MSCONFIG_NEW] - Reenable the FREELDR.INI/BOOT.INI page. When boot items are added in the list, recompute its new contents width and adjust it so that we can horizontally scroll i...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Oct 21 23:43:26 2015 New Revision: 69638 URL:
http://svn.reactos.org/svn/reactos?rev=69638&view=rev
Log: [MSCONFIG_NEW] - Reenable the FREELDR.INI/BOOT.INI page. When boot items are added in the list, recompute its new contents width and adjust it so that we can horizontally scroll its contents (this is the only common control which does not support automatic width computation when you add contents in it...). - Save the original FREELDR.INI/BOOT.INI in a default path (I took the one used by windows' msconfig for its INI files). CORE-9333 Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/fileextractdialog.c trunk/reactos/base/applications/msconfig_new/fileutils.c trunk/reactos/base/applications/msconfig_new/fileutils.h trunk/reactos/base/applications/msconfig_new/freeldrpage.c trunk/reactos/base/applications/msconfig_new/freeldrpage.h trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc trunk/reactos/base/applications/msconfig_new/lang/en-US.rc trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/msconfig.rc trunk/reactos/base/applications/msconfig_new/resource.h trunk/reactos/base/applications/msconfig_new/toolspage.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/fileutils.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/fileutils.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/msconfig.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
9 years, 2 months
1
0
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
35
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Results per page:
10
25
50
100
200