Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 65095: [BROWSEUI] * Implement File->Close
by dquintana＠svn.reactos.org 29 Oct '14

29 Oct '14

Author: dquintana Date: Wed Oct 29 11:14:28 2014 New Revision: 65095 URL: http://svn.reactos.org/svn/reactos?rev=65095&view=rev Log: [BROWSEUI] * Implement File->Close Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Oct 29 11:14:28 2014 @@ -3178,7 +3178,7 @@ LRESULT CShellBrowser::OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - return 0; + return SendMessage(WM_CLOSE); } LRESULT CShellBrowser::OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled)

1 0

[dquintana] 65094: [BROWSEUI] * Implement executing the items from the Favorites menu.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 22:28:28 2014 New Revision: 65094 URL: http://svn.reactos.org/svn/reactos?rev=65094&view=rev Log: [BROWSEUI] * Implement executing the items from the Favorites menu. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Oct 28 22:28:28 2014 @@ -632,6 +632,7 @@ case SMC_GETSFOBJECT: break; case SMC_SFEXEC: + SHInvokeDefaultCommand(psmd->hwnd, psmd->psf, psmd->pidlItem); break; case SMC_SFSELECTITEM: break;

1 0

[tkreuzer] 65093: [GDI32] Improve functions in coord.c: - Use GdiGetDcAttr() where appropriate - Fix SetLastError() usage - Add annotations - improve variable naming - Add some comments
by tkreuzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: tkreuzer Date: Tue Oct 28 22:16:24 2014 New Revision: 65093 URL: http://svn.reactos.org/svn/reactos?rev=65093&view=rev Log: [GDI32] Improve functions in coord.c: - Use GdiGetDcAttr() where appropriate - Fix SetLastError() usage - Add annotations - improve variable naming - Add some comments Modified: trunk/reactos/win32ss/gdi/gdi32/objects/coord.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/coord.c [iso-8859-1] Tue Oct 28 22:16:24 2014 @@ -25,10 +25,10 @@ void GdiTransformPoints2( - XFORM *pxform, - PPOINT pptOut, - PPOINT pptIn, - ULONG nCount) + _In_ XFORM *pxform, + _Out_writes_(nCount) PPOINT pptOut, + _In_reads_(nCount) PPOINT pptIn, + _In_ ULONG nCount) { ULONG i; FLOAT x, y; @@ -45,10 +45,10 @@ FORCEINLINE void GdiTransformPoints( - MATRIX *pmx, - PPOINT pptOut, - PPOINT pptIn, - ULONG nCount) + _In_ MATRIX *pmx, + _Out_writes_(nCount) PPOINT pptOut, + _In_reads_(nCount) PPOINT pptIn, + _In_ ULONG nCount) { XFORM xform; @@ -62,9 +62,9 @@ BOOL WINAPI CombineTransform( - LPXFORM pxfResult, - const XFORM *pxf1, - const XFORM *pxf2) + _Out_ LPXFORM pxfResult, + _In_ const XFORM *pxf1, + _In_ const XFORM *pxf2) { XFORM xformTmp; @@ -111,7 +111,8 @@ */ int WINAPI -GetMapMode(HDC hdc) +GetMapMode( + _In_ HDC hdc) { PDC_ATTR pdcattr; @@ -123,6 +124,7 @@ return 0; } + /* Return the map mode */ return pdcattr->iMapMode; } @@ -157,29 +159,35 @@ } } #endif + /* Force change if Isotropic is set for recompute. */ if ((iMode != pdcattr->iMapMode) || (iMode == MM_ISOTROPIC)) { pdcattr->ulDirty_ &= ~SLOW_WIDTHS; - return GetAndSetDCDWord( hdc, GdiGetSetMapMode, iMode, 0, 0, 0 ); - } - + return GetAndSetDCDWord(hdc, GdiGetSetMapMode, iMode, 0, 0, 0); + } + + /* Simply return the old mode, which equals the new mode */ return pdcattr->iMapMode; } BOOL WINAPI -DPtoLP(HDC hdc, LPPOINT lpPoints, INT nCount) +DPtoLP( + _In_ HDC hdc, + _Inout_updates_(nCount) LPPOINT lpPoints, + _In_ INT nCount) { #if 0 INT i; PDC_ATTR pdcattr; + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); if (!pdcattr) { - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -198,16 +206,20 @@ BOOL WINAPI -LPtoDP(HDC hdc, LPPOINT lpPoints, INT nCount) +LPtoDP( + _In_ HDC hdc, + _Inout_updates_(nCount) LPPOINT lpPoints, + _In_ INT nCount) { #if 0 INT i; PDC_ATTR pdcattr; + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); if (!pdcattr) { - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -230,44 +242,46 @@ */ BOOL WINAPI -GetCurrentPositionEx(HDC hdc, - LPPOINT lpPoint) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - - if ( lpPoint ) - { - if ( Dc_Attr->ulDirty_ & DIRTY_PTLCURRENT ) // have a hit! - { - lpPoint->x = Dc_Attr->ptfxCurrent.x; - lpPoint->y = Dc_Attr->ptfxCurrent.y; - DPtoLP ( hdc, lpPoint, 1); // reconvert back. - Dc_Attr->ptlCurrent.x = lpPoint->x; // save it - Dc_Attr->ptlCurrent.y = lpPoint->y; - Dc_Attr->ulDirty_ &= ~DIRTY_PTLCURRENT; // clear bit - } - else - { - lpPoint->x = Dc_Attr->ptlCurrent.x; - lpPoint->y = Dc_Attr->ptlCurrent.y; - } +GetCurrentPositionEx( + _In_ HDC hdc, + _Out_ LPPOINT lpPoint) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if ((pdcattr == NULL) || (lpPoint == NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (pdcattr->ulDirty_ & DIRTY_PTLCURRENT) // have a hit! + { + lpPoint->x = pdcattr->ptfxCurrent.x; + lpPoint->y = pdcattr->ptfxCurrent.y; + DPtoLP(hdc, lpPoint, 1); // reconvert back. + pdcattr->ptlCurrent.x = lpPoint->x; // save it + pdcattr->ptlCurrent.y = lpPoint->y; + pdcattr->ulDirty_ &= ~DIRTY_PTLCURRENT; // clear bit } else { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -GetWorldTransform(HDC hDC, LPXFORM lpXform) + lpPoint->x = pdcattr->ptlCurrent.x; + lpPoint->y = pdcattr->ptlCurrent.y; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetWorldTransform( + _In_ HDC hdc, + _Out_ LPXFORM pxform) { #if 0 PDC_ATTR pdcattr; @@ -284,38 +298,41 @@ GdiFixupTransforms(pdcattr); } - MatrixToXForm(lpXform, &pdcattr->mxWorldToDevice); -#endif - return NtGdiGetTransform(hDC, GdiWorldSpaceToPageSpace, lpXform); -} - - -BOOL -WINAPI -SetWorldTransform( HDC hDC, CONST XFORM *Xform ) + MatrixToXForm(pxform, &pdcattr->mxWorldToDevice); +#endif + return NtGdiGetTransform(hdc, GdiWorldSpaceToPageSpace, pxform); +} + + +BOOL +WINAPI +SetWorldTransform( + _In_ HDC hdc, + _Out_ CONST XFORM *pxform) { /* FIXME shall we add undoc #define MWT_SETXFORM 4 ?? */ - return ModifyWorldTransform( hDC, Xform, MWT_MAX+1); + return ModifyWorldTransform(hdc, pxform, MWT_MAX+1); } BOOL WINAPI ModifyWorldTransform( - HDC hDC, - CONST XFORM *Xform, - DWORD iMode -) -{ + _In_ HDC hdc, + _In_opt_ CONST XFORM *pxform, + _In_ DWORD dwMode) +{ + PDC_ATTR pdcattr; + #if 0 // Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return FALSE; else { - PLDC pLDC = GdiGetLDC(hDC); + PLDC pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -323,43 +340,59 @@ } if (pLDC->iType == LDC_EMFLDC) { - if (iMode == MWT_MAX+1) - if (!EMFDRV_SetWorldTransform( hDC, Xform) ) return FALSE; - return EMFDRV_ModifyWorldTransform( hDC, Xform, iMode); // Ported from wine. + if (dwMode == MWT_MAX+1) + if (!EMFDRV_SetWorldTransform(hdc, pxform) ) return FALSE; + return EMFDRV_ModifyWorldTransform(hdc, pxform, dwMode); // Ported from wine. } return FALSE; } } #endif - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } /* Check that graphics mode is GM_ADVANCED */ - if ( Dc_Attr->iGraphicsMode != GM_ADVANCED ) return FALSE; - - return NtGdiModifyWorldTransform(hDC, (CONST LPXFORM) Xform, iMode); + if (pdcattr->iGraphicsMode != GM_ADVANCED) + return FALSE; + + /* Call win32k to do the work */ + return NtGdiModifyWorldTransform(hdc, (LPXFORM)pxform, dwMode); } BOOL WINAPI GetViewportExtEx( - HDC hdc, - LPSIZE lpSize -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - - if ((Dc_Attr->flXform & PAGE_EXTENTS_CHANGED) && (Dc_Attr->iMapMode == MM_ISOTROPIC)) - // Something was updated, go to kernel. - return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (PPOINTL) lpSize ); - else - { - lpSize->cx = Dc_Attr->szlViewportExt.cx; - lpSize->cy = Dc_Attr->szlViewportExt.cy; - } + _In_ HDC hdc, + _Out_ LPSIZE lpSize) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return FALSE; + } + + /* Check if we need to update values */ + if ((pdcattr->flXform & PAGE_EXTENTS_CHANGED) && + (pdcattr->iMapMode == MM_ISOTROPIC)) + { + /* Call win32k to do the work */ + return NtGdiGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)lpSize); + } + + /* Nothing to calculate, return the current extension */ + lpSize->cx = pdcattr->szlViewportExt.cx; + lpSize->cy = pdcattr->szlViewportExt.cy; + return TRUE; } @@ -367,53 +400,80 @@ BOOL WINAPI GetViewportOrgEx( - HDC hdc, - LPPOINT lpPoint -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - lpPoint->x = Dc_Attr->ptlViewportOrg.x; - lpPoint->y = Dc_Attr->ptlViewportOrg.y; - if (Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; - return TRUE; - // return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); + _In_ HDC hdc, + _Out_ LPPOINT lpPoint) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return FALSE; + } + + /* Get the current viewport org */ + lpPoint->x = pdcattr->ptlViewportOrg.x; + lpPoint->y = pdcattr->ptlViewportOrg.y; + + /* Handle right-to-left layout */ + if (pdcattr->dwLayout & LAYOUT_RTL) + lpPoint->x = -lpPoint->x; + + return TRUE; } BOOL WINAPI GetWindowExtEx( - HDC hdc, - LPSIZE lpSize -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - lpSize->cx = Dc_Attr->szlWindowExt.cx; - lpSize->cy = Dc_Attr->szlWindowExt.cy; - if (Dc_Attr->dwLayout & LAYOUT_RTL) lpSize->cx = -lpSize->cx; - return TRUE; - // return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); + _In_ HDC hdc, + _Out_ LPSIZE lpSize) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return FALSE; + } + + /* Get the current window extension */ + lpSize->cx = pdcattr->szlWindowExt.cx; + lpSize->cy = pdcattr->szlWindowExt.cy; + + /* Handle right-to-left layout */ + if (pdcattr->dwLayout & LAYOUT_RTL) + lpSize->cx = -lpSize->cx; + + return TRUE; } BOOL WINAPI GetWindowOrgEx( - HDC hdc, - LPPOINT lpPoint -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - lpPoint->x = Dc_Attr->ptlWindowOrg.x; - lpPoint->y = Dc_Attr->ptlWindowOrg.y; - return TRUE; - //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); + _In_ HDC hdc, + _Out_ LPPOINT lpPoint) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return FALSE; + } + + /* Get the current window origin */ + lpPoint->x = pdcattr->ptlWindowOrg.x; + lpPoint->y = pdcattr->ptlWindowOrg.y; + + return TRUE; } /* @@ -421,12 +481,13 @@ */ BOOL WINAPI -SetViewportExtEx(HDC hdc, - int nXExtent, - int nYExtent, - LPSIZE lpSize) -{ - PDC_ATTR Dc_Attr; +SetViewportExtEx( + _In_ HDC hdc, + _In_ int nXExtent, + _In_ int nYExtent, + _Out_opt_ LPSIZE lpSize) +{ + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -447,35 +508,53 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) - { - return FALSE; - } - + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Check if the caller wants the old extension */ if (lpSize) { - lpSize->cx = Dc_Attr->szlViewportExt.cx; - lpSize->cy = Dc_Attr->szlViewportExt.cy; - } - - if ((Dc_Attr->szlViewportExt.cx == nXExtent) && (Dc_Attr->szlViewportExt.cy == nYExtent)) + /* Return the current viewport extension */ + lpSize->cx = pdcattr->szlViewportExt.cx; + lpSize->cy = pdcattr->szlViewportExt.cy; + } + + /* Check for trivial case */ + if ((pdcattr->szlViewportExt.cx == nXExtent) && + (pdcattr->szlViewportExt.cy == nYExtent)) return TRUE; - if ((Dc_Attr->iMapMode == MM_ISOTROPIC) || (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + /* Only change viewport extension if we are in iso or aniso mode */ + if ((pdcattr->iMapMode == MM_ISOTROPIC) || + (pdcattr->iMapMode == MM_ANISOTROPIC)) { if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - Dc_Attr->szlViewportExt.cx = nXExtent; - Dc_Attr->szlViewportExt.cy = nYExtent; - if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); - Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); - } + if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + /* Set the new viewport extension */ + pdcattr->szlViewportExt.cx = nXExtent; + pdcattr->szlViewportExt.cy = nYExtent; + + /* Handle right-to-left layout */ + if (pdcattr->dwLayout & LAYOUT_RTL) + NtGdiMirrorWindowOrg(hdc); + + /* Update xform flags */ + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + } + return TRUE; } @@ -484,13 +563,14 @@ */ BOOL WINAPI -SetWindowOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; +SetWindowOrgEx( + _In_ HDC hdc, + _In_ int X, + _In_ int Y, + _Out_opt_ LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -511,31 +591,37 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return FALSE; + } if (lpPoint) { - lpPoint->x = Dc_Attr->ptlWindowOrg.x; - lpPoint->y = Dc_Attr->ptlWindowOrg.y; - } - - if ((Dc_Attr->ptlWindowOrg.x == X) && (Dc_Attr->ptlWindowOrg.y == Y)) + lpPoint->x = pdcattr->ptlWindowOrg.x; + lpPoint->y = pdcattr->ptlWindowOrg.y; + } + + if ((pdcattr->ptlWindowOrg.x == X) && (pdcattr->ptlWindowOrg.y == Y)) return TRUE; if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } - } - - Dc_Attr->ptlWindowOrg.x = X; - Dc_Attr->lWindowOrgx = X; - Dc_Attr->ptlWindowOrg.y = Y; - if (Dc_Attr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + pdcattr->ptlWindowOrg.x = X; + pdcattr->lWindowOrgx = X; + pdcattr->ptlWindowOrg.y = Y; + if (pdcattr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); + pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); return TRUE; #endif return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); @@ -559,6 +645,7 @@ ulType = GDI_HANDLE_GET_TYPE(hdc); switch (ulType) { + case GDILoObjType_LO_ALTDC_TYPE: case GDILoObjType_LO_DC_TYPE: /* Handle this in the path below */ break; @@ -584,11 +671,16 @@ return FALSE; } + /* Check if the caller wants the old extension */ if (lpSize) { + /* Return the current window extension */ lpSize->cx = pdcattr->szlWindowExt.cx; lpSize->cy = pdcattr->szlWindowExt.cy; - if (pdcattr->dwLayout & LAYOUT_RTL) lpSize->cx = -lpSize->cx; + + /* Handle right-to-left layout */ + if (pdcattr->dwLayout & LAYOUT_RTL) + lpSize->cx = -lpSize->cx; } if (pdcattr->dwLayout & LAYOUT_RTL) @@ -596,12 +688,15 @@ NtGdiMirrorWindowOrg(hdc); pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } - else if ((pdcattr->iMapMode == MM_ISOTROPIC) || (pdcattr->iMapMode == MM_ANISOTROPIC)) - { - if ((pdcattr->szlWindowExt.cx == nXExtent) && (pdcattr->szlWindowExt.cy == nYExtent)) + else if ((pdcattr->iMapMode == MM_ISOTROPIC) || + (pdcattr->iMapMode == MM_ANISOTROPIC)) + { + if ((pdcattr->szlWindowExt.cx == nXExtent) && + (pdcattr->szlWindowExt.cy == nYExtent)) return TRUE; - if ((!nXExtent) || (!nYExtent)) return FALSE; + if ((!nXExtent) || (!nYExtent)) + return FALSE; if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { @@ -611,9 +706,12 @@ pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); } } + pdcattr->szlWindowExt.cx = nXExtent; pdcattr->szlWindowExt.cy = nYExtent; - if (pdcattr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); + if (pdcattr->dwLayout & LAYOUT_RTL) + NtGdiMirrorWindowOrg(hdc); + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } @@ -625,13 +723,14 @@ */ BOOL WINAPI -SetViewportOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; +SetViewportOrgEx( + _In_ HDC hdc, + _In_ int X, + _In_ int Y, + _Out_opt_ LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -652,18 +751,25 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (!pdcattr) + { + /* Do not set LastError here! */ + return FALSE; + } if (lpPoint) { - lpPoint->x = Dc_Attr->ptlViewportOrg.x; - lpPoint->y = Dc_Attr->ptlViewportOrg.y; - if (Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; - } - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); - if (Dc_Attr->dwLayout & LAYOUT_RTL) X = -X; - Dc_Attr->ptlViewportOrg.x = X; - Dc_Attr->ptlViewportOrg.y = Y; + lpPoint->x = pdcattr->ptlViewportOrg.x; + lpPoint->y = pdcattr->ptlViewportOrg.y; + if (pdcattr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; + } + pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + if (pdcattr->dwLayout & LAYOUT_RTL) X = -X; + pdcattr->ptlViewportOrg.x = X; + pdcattr->ptlViewportOrg.y = Y; return TRUE; #endif return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); @@ -675,22 +781,21 @@ BOOL WINAPI ScaleViewportExtEx( - HDC a0, - int a1, - int a2, - int a3, - int a4, - LPSIZE a5 -) -{ -#if 0 - if (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC) + _In_ HDC hdc, + _In_ INT xNum, + _In_ INT xDenom, + _In_ INT yNum, + _In_ INT yDenom, + _Out_ LPSIZE lpSize) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(a0) == GDI_OBJECT_TYPE_METADC) return MFDRV_; else { - PLDC pLDC = GdiGetLDC(a0); + PLDC pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -703,10 +808,13 @@ } } #endif - if (!GdiIsHandleValid((HGDIOBJ) a0) || - (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC)) return FALSE; - - return NtGdiScaleViewportExtEx(a0, a1, a2, a3, a4, a5); + if (!GdiGetDcAttr(hdc)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return NtGdiScaleViewportExtEx(hdc, xNum, xDenom, yNum, yDenom, lpSize); } /* @@ -715,22 +823,21 @@ BOOL WINAPI ScaleWindowExtEx( - HDC a0, - int a1, - int a2, - int a3, - int a4, - LPSIZE a5 -) -{ -#if 0 - if (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(a0) == GDI_OBJECT_TYPE_METADC) + _In_ HDC hdc, + _In_ INT xNum, + _In_ INT xDenom, + _In_ INT yNum, + _In_ INT yDenom, + _Out_ LPSIZE lpSize) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return MFDRV_; else { - PLDC pLDC = GdiGetLDC(a0); + PLDC pLDC = GdiGetLDC(hdc); if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -743,10 +850,14 @@ } } #endif - if (!GdiIsHandleValid((HGDIOBJ) a0) || - (GDI_HANDLE_GET_TYPE(a0) != GDI_OBJECT_TYPE_DC)) return FALSE; - - return NtGdiScaleWindowExtEx(a0, a1, a2, a3, a4, a5); + + if (!GdiGetDcAttr(hdc)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return NtGdiScaleWindowExtEx(hdc, xNum, xDenom, yNum, yDenom, lpSize); } /* @@ -754,12 +865,28 @@ */ DWORD WINAPI -GetLayout(HDC hdc - ) -{ - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; - return Dc_Attr->dwLayout; +GetLayout( + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* METADC16 is not supported in this API */ + if (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_METADC16_TYPE) + { + return GDI_ERROR; + } + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (!pdcattr) + { + /* Set the error value and return failure */ + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + + /* Return the layout */ + return pdcattr->dwLayout; } @@ -768,8 +895,9 @@ */ DWORD WINAPI -SetLayout(HDC hdc, - DWORD dwLayout) +SetLayout( + _In_ HDC hdc, + _In_ DWORD dwLayout) { #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -791,9 +919,13 @@ } } #endif - if (!GdiIsHandleValid((HGDIOBJ) hdc) || - (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return GDI_ERROR; - return NtGdiSetLayout( hdc, -1, dwLayout); + if (!GdiGetDcAttr(hdc)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + + return NtGdiSetLayout(hdc, -1, dwLayout); } /* @@ -801,10 +933,23 @@ */ DWORD WINAPI -SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) -{ - if (!GdiIsHandleValid((HGDIOBJ) hdc) || - (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return GDI_ERROR; +SetLayoutWidth( + _In_ HDC hdc, + _In_ LONG wox, + _In_ DWORD dwLayout) +{ + /* Only normal DCs are handled here */ + if (GDI_HANDLE_GET_TYPE(hdc) != GDILoObjType_LO_DC_TYPE) + { + return GDI_ERROR; + } + + if (!GdiGetDcAttr(hdc)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + return NtGdiSetLayout( hdc, wox, dwLayout); } @@ -814,10 +959,10 @@ BOOL WINAPI GetDCOrgEx( - HDC hdc, - LPPOINT lpPoint) -{ - return NtGdiGetDCPoint( hdc, GdiGetDCOrg, (PPOINTL)lpPoint ); + _In_ HDC hdc, + _Out_ LPPOINT lpPoint) +{ + return NtGdiGetDCPoint(hdc, GdiGetDCOrg, (PPOINTL)lpPoint); } @@ -827,13 +972,16 @@ LONG WINAPI GetDCOrg( - HDC hdc) -{ - // Officially obsolete by Microsoft - POINT Pt; - if (!GetDCOrgEx(hdc, &Pt)) + _In_ HDC hdc) +{ + POINT pt; + + /* Call the new API */ + if (!GetDCOrgEx(hdc, &pt)) return 0; - return(MAKELONG(Pt.x, Pt.y)); + + /* Return the point in the old way */ + return(MAKELONG(pt.x, pt.y)); } @@ -843,13 +991,14 @@ */ BOOL WINAPI -OffsetViewportOrgEx(HDC hdc, - int nXOffset, - int nYOffset, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; +OffsetViewportOrgEx( + _In_ HDC hdc, + _In_ int nXOffset, + _In_ int nYOffset, + _Out_opt_ LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -870,28 +1019,35 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - - if ( lpPoint ) - { - *lpPoint = (POINT)Dc_Attr->ptlViewportOrg; - if ( Dc_Attr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (!pdcattr) + { + /* Do not set LastError here! */ + return FALSE; + } + + if (lpPoint) + { + *lpPoint = (POINT)pdcattr->ptlViewportOrg; + if ( pdcattr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; } if ( nXOffset || nYOffset != nXOffset ) { if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) { - if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); - Dc_Attr->ulDirty_ &= ~DC_MODE_DIRTY; - } - } - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); - if ( Dc_Attr->dwLayout & LAYOUT_RTL) nXOffset = -nXOffset; - Dc_Attr->ptlViewportOrg.x += nXOffset; - Dc_Attr->ptlViewportOrg.y += nYOffset; + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; + } + } + + pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + if (pdcattr->dwLayout & LAYOUT_RTL) nXOffset = -nXOffset; + pdcattr->ptlViewportOrg.x += nXOffset; + pdcattr->ptlViewportOrg.y += nYOffset; } return TRUE; #endif @@ -904,13 +1060,14 @@ */ BOOL WINAPI -OffsetWindowOrgEx(HDC hdc, - int nXOffset, - int nYOffset, - LPPOINT lpPoint) -{ -#if 0 - PDC_ATTR Dc_Attr; +OffsetWindowOrgEx( + _In_ HDC hdc, + _In_ int nXOffset, + _In_ int nYOffset, + _Out_opt_ LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR pdcattr; #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -931,28 +1088,35 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (!pdcattr) + { + /* Do not set LastError here! */ + return FALSE; + } if ( lpPoint ) { - *lpPoint = (POINT)Dc_Attr->ptlWindowOrg; - lpPoint->x = Dc_Attr->lWindowOrgx; + *lpPoint = (POINT)pdcattr->ptlWindowOrg; + lpPoint->x = pdcattr->lWindowOrgx; } if ( nXOffset || nYOffset != nXOffset ) { if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) { - if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); - Dc_Attr->ulDirty_ &= ~DC_MODE_DIRTY; - } - } - Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); - Dc_Attr->ptlWindowOrg.x += nXOffset; - Dc_Attr->ptlWindowOrg.y += nYOffset; - Dc_Attr->lWindowOrgx += nXOffset; + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; + } + } + + pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + pdcattr->ptlWindowOrg.x += nXOffset; + pdcattr->ptlWindowOrg.y += nYOffset; + pdcattr->lWindowOrgx += nXOffset; } return TRUE; #endif

1 0

[dquintana] 65092: [RSHELL] * Remove a few GCC unused-but-set-variable warnings.
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 22:13:18 2014 New Revision: 65092 URL: http://svn.reactos.org/svn/reactos?rev=65092&view=rev Log: [RSHELL] * Remove a few GCC unused-but-set-variable warnings. Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Tue Oct 28 22:13:18 2014 @@ -417,14 +417,16 @@ } else { + + /* FIXME: Update work area */ +#if 0 RECT rcDesktop; rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - /* FIXME: Update work area */ +#endif } break; Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Tue Oct 28 22:13:18 2014 @@ -396,12 +396,10 @@ TRACE("MouseDown %d\n", m_isLButtonDown); - BOOL isTracking = FALSE; if (entry) { ScreenToClient(child, &pt); iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); - isTracking = entry->mb->_IsTracking(); if (iHitTestResult >= 0) { @@ -448,12 +446,10 @@ TRACE("MouseUp %d\n", m_isLButtonDown); - BOOL isTracking = FALSE; if (entry) { ScreenToClient(child, &pt); iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); - isTracking = entry->mb->_IsTracking(); if (iHitTestResult >= 0) {

1 0

[zguo] 65091: [WIN32SS] Fix icon selection regression caused by cascading fix. In this case, this should probably go into trunk. CORE-8574
by zguo＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: zguo Date: Tue Oct 28 22:01:57 2014 New Revision: 65091 URL: http://svn.reactos.org/svn/reactos?rev=65091&view=rev Log: [WIN32SS] Fix icon selection regression caused by cascading fix. In this case, this should probably go into trunk. CORE-8574 Modified: branches/0.3.17/reactos/win32ss/user/ntuser/msgqueue.c Modified: branches/0.3.17/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/win32ss/user/ntu… ============================================================================== --- branches/0.3.17/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Oct 28 22:01:57 2014 @@ -1676,8 +1676,21 @@ MSG msg; PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; + // First look for any buttons downs or ups before testing for the move. + if (pti->nCntsQBits[QSRosMouseButton]) + { + if (co_MsqPeekHardwareMessage( pti, + Remove, + Window, + MsgFilterLow, + MsgFilterHigh, + QS_MOUSEBUTTON, + pMsg)) + return TRUE; // Have one and return. + } + if(!(MessageQueue->MouseMoved)) - return FALSE; + return FALSE; if (!MessageQueue->ptiSysLock) {

1 0

[pschweitzer] 65090: [DISK] Get ready to enter into the 10th dimension... So: - Implement support for IRP_MJ_FILE_SYSTEM_CONTROL. Yes... You read well! So, implemented a ScsiDiskFileSystemControl()...
by pschweitzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: pschweitzer Date: Tue Oct 28 21:59:57 2014 New Revision: 65090 URL: http://svn.reactos.org/svn/reactos?rev=65090&view=rev Log: [DISK] Get ready to enter into the 10th dimension... So: - Implement support for IRP_MJ_FILE_SYSTEM_CONTROL. Yes... You read well! So, implemented a ScsiDiskFileSystemControl() function. The way it is added to the DriverObject is a big hack, class2 is not supposed to have such requests, so, we do it in its back. Fear! - Stubplement the NtfsRussinovichism() function. This is the only function we're supposed to call with IRP MJ FSCTRL and with IRP MN USRFSRQST. Its purpose (when its implemented) is to reply back to the M. Russinovich tools (NFI & NTFSInfo) so that they can directly dump NTFS information without going into NTFS driver. They kind of bypass it. We do all agree this is a ugly hack. But it exists in Windows, as these tools work in Windows. And it would be useful they actually work in ReactOS. Soon, we'll be able to publish a book "ReactOS Internals" where we speak about undocumented FS controls to dump NTFS information to show how well our NTFS works ;-). Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Tue Oct 28 21:59:57 2014 @@ -310,6 +310,11 @@ IN PDEVICE_OBJECT DeviceObject ); +NTSTATUS +NTAPI +ScsiDiskFileSystemControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, DriverEntry) #pragma alloc_text(PAGE, FindScsiDisks) @@ -379,6 +384,11 @@ InitializationData.ClassDeviceControl = ScsiDiskDeviceControl; InitializationData.ClassShutdownFlush = ScsiDiskShutdownFlush; InitializationData.ClassCreateClose = NULL; + + // + // HACK! Please check below to the implementation of the function + // + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = ScsiDiskFileSystemControl; // // Call the class init routine @@ -5202,3 +5212,56 @@ } } // end UpdateDeviceObjects() + +// +// This function is supposed only to support NTFS tools +// from M. Russinovich. This is kind of huge hack and is +// totally undocumented :-). +// +NTSTATUS +NtfsRussinovichism(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +// +// Hack: this function is not supposed to be implemented +// Even though it's required to enable some M. Russinovich +// to directly request disks so that they can dump NTFS data +// without going through the driver. +// We don't expect doing more from here, hence the limited +// implementation and support. +// +NTSTATUS +NTAPI +ScsiDiskFileSystemControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + + DPRINT1("ScsiDiskFileSystemControl(%p, %p)\n", DeviceObject, Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->MinorFunction) + { + case IRP_MN_USER_FS_REQUEST: + Status = NtfsRussinovichism(DeviceObject, Irp); + break; + + default: + DPRINT("MinorFunction %d\n", Stack->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +}

1 0

[ekohl] 65089: [NET] Display more password information in the NET USER command.
by ekohl＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: ekohl Date: Tue Oct 28 21:57:41 2014 New Revision: 65089 URL: http://svn.reactos.org/svn/reactos?rev=65089&view=rev Log: [NET] Display more password information in the NET USER command. Modified: trunk/reactos/base/applications/network/net/cmdUser.c Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Tue Oct 28 21:57:41 2014 @@ -86,6 +86,7 @@ RtlSecondsSince1970ToTime(dwSeconds, &Time); FileTime.dwLowDateTime = Time.u.LowPart; FileTime.dwHighDateTime = Time.u.HighPart; + FileTimeToLocalFileTime(&FileTime, &FileTime); FileTimeToSystemTime(&FileTime, &SystemTime); GetDateFormatW(LOCALE_USER_DEFAULT, @@ -107,11 +108,29 @@ static +DWORD +GetTimeInSeconds(VOID) +{ + LARGE_INTEGER Time; + FILETIME FileTime; + DWORD dwSeconds; + + GetSystemTimeAsFileTime(&FileTime); + Time.u.LowPart = FileTime.dwLowDateTime; + Time.u.HighPart = FileTime.dwHighDateTime; + RtlTimeToSecondsSince1970(&Time, &dwSeconds); + + return dwSeconds; +} + + +static NET_API_STATUS DisplayUser(LPWSTR lpUserName) { PUSER_MODALS_INFO_0 pUserModals = NULL; PUSER_INFO_4 pUserInfo = NULL; + DWORD dwLastSet; NET_API_STATUS Status; /* Modify the user */ @@ -141,17 +160,22 @@ PrintDateTime(pUserInfo->usri4_acct_expires); PrintToConsole(L"\n"); - PrintToConsole(L"Password last set \n"); PrintToConsole(L"Password expires "); - if (pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER) + dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age; + PrintDateTime(dwLastSet); + + PrintToConsole(L"Password expires "); + if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) || pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER) PrintToConsole(L"Never\n"); else - PrintDateTime(pUserInfo->usri4_acct_expires); - - PrintToConsole(L"Password changeable \n"); - PrintToConsole(L"Password required \n"); - PrintToConsole(L"User may change password \n"); + PrintDateTime(dwLastSet + pUserModals->usrmod0_max_passwd_age); + + PrintToConsole(L"Password changeable "); + PrintDateTime(dwLastSet + pUserModals->usrmod0_min_passwd_age); + + PrintToConsole(L"Password required %s\n", (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ? L"No" : L"Yes"); + PrintToConsole(L"User may change password %s\n", (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ? L"No" : L"Yes"); PrintToConsole(L"\n"); PrintToConsole(L"Workstation allowed %s\n", pUserInfo->usri4_workstations); @@ -196,6 +220,7 @@ LPWSTR lpPassword = NULL; PUSER_INFO_4 pUserInfo = NULL; USER_INFO_4 UserInfo; + LPWSTR p; NET_API_STATUS Status; if (argc == 2) @@ -281,6 +306,21 @@ { if (_wcsnicmp(argv[j], L"/active:", 8) == 0) { + p = &argv[i][8]; + if (_wcsicmp(p, L"yes") == 0) + { + + } + else if (_wcsicmp(p, L"no") == 0) + { + + } + else + { + PrintToConsole(L"You entered an invalid value for the /ACTIVE option.\n"); + result = 1; + goto done; + } } else if (_wcsnicmp(argv[j], L"/comment:", 9) == 0) {

1 0

[dquintana] 65088: [RSHELL] * CMenuBand: Refcount before assigning a return pointer. * CMenuDeskBar: Revert change and protect the refcounting in case I was wrong to assume there will be exactly on...
by dquintana＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: dquintana Date: Tue Oct 28 21:40:50 2014 New Revision: 65088 URL: http://svn.reactos.org/svn/reactos?rev=65088&view=rev Log: [RSHELL] * CMenuBand: Refcount before assigning a return pointer. * CMenuDeskBar: Revert change and protect the refcounting in case I was wrong to assume there will be exactly one OnFinalMessage for each OnCreate. * CMenuToolbars: Add a debug message. * CStartMenu: Refcount correctly. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/include/reactos/undocshell.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -628,21 +628,22 @@ return S_OK; } - HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); - - return hr; + return punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); } HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) { // HACK, so I can test for a submenu in the DeskBar - if (ppunkClient) - { - if (m_subMenuChild) - *ppunkClient = m_subMenuChild; - else - *ppunkClient = NULL; - } + if (!ppunkClient) + return E_POINTER; + *ppunkClient = NULL; + + if (m_subMenuChild) + { + m_subMenuChild->AddRef(); + *ppunkClient = m_subMenuChild; + } + return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -39,7 +39,8 @@ m_IconSize(0), m_Banner(NULL), m_Shown(FALSE), - m_ShowFlags(0) + m_ShowFlags(0), + m_didAddRef(FALSE) { } @@ -49,7 +50,11 @@ LRESULT CMenuDeskBar::_OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - this->AddRef(); + if (!m_didAddRef) + { + this->AddRef(); + m_didAddRef = TRUE; + } bHandled = FALSE; return 0; @@ -57,6 +62,11 @@ void CMenuDeskBar::OnFinalMessage(HWND /* hWnd */) { + if (m_didAddRef) + { + this->Release(); + m_didAddRef = FALSE; + } } HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -49,6 +49,8 @@ BOOL m_Shown; DWORD m_ShowFlags; + + BOOL m_didAddRef; virtual void OnFinalMessage(HWND hWnd); public: Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -1374,6 +1374,7 @@ pidl = ILClone(m_idList); if (!pidl) { + ERR("ILClone failed!\n"); (*reinterpret_cast<IUnknown**>(ppv))->Release(); return E_FAIL; } Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -262,16 +262,13 @@ IBandSite* pBandSite, IDeskBar* pDeskBar) { - m_pShellMenu.Attach(pShellMenu); - m_pBandSite.Attach(pBandSite); - m_pDeskBar.Attach(pDeskBar); + m_pShellMenu = pShellMenu; + m_pBandSite = pBandSite; + m_pDeskBar = pDeskBar; } ~CShellMenuCallback() { - m_pShellMenu.Release(); - m_pBandSite.Release(); - m_pDeskBar.Release(); } HRESULT _SetProgramsFolder(IShellFolder * psf, LPITEMIDLIST pidl) Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -38,9 +38,9 @@ #define COBJMACROS //#define DEBUG_CCOMOBJECT -//#define DEBUG_CCOMOBJECT_CREATION 1 -//#define DEBUG_CCOMOBJECT_DESTRUCTION 1 -//#define DEBUG_CCOMOBJECT_REFCOUNTING 0 +#define DEBUG_CCOMOBJECT_CREATION 1 +#define DEBUG_CCOMOBJECT_DESTRUCTION 1 +#define DEBUG_CCOMOBJECT_REFCOUNTING 1 #include <windef.h> #include <winbase.h> Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Tue Oct 28 21:40:50 2014 @@ -731,6 +731,24 @@ } template<class T, class R> +HRESULT inline ShellDebugObjectCreator(REFIID riid, R ** ppv) +{ + CComPtr<T> obj; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new CComDebugObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + if (FAILED(hResult)) + return hResult; + return S_OK; +} + +template<class T, class R> HRESULT inline ShellObjectCreator(REFIID riid, R ** ppv) { CComPtr<T> obj;

1 0

[khornicek] 65087: [WIN32K] - addendum to revision 64877 which slightly changed UserDrawCaption's logic - fixes window title being drawn over the icon
by khornicek＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: khornicek Date: Tue Oct 28 21:38:26 2014 New Revision: 65087 URL: http://svn.reactos.org/svn/reactos?rev=65087&view=rev Log: [WIN32K] - addendum to revision 64877 which slightly changed UserDrawCaption's logic - fixes window title being drawn over the icon 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] Tue Oct 28 21:38:26 2014 @@ -2143,9 +2143,13 @@ UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL); UserDereferenceObject(pIcon); } - } - - if (hIcon) + else + { + HasIcon = FALSE; + } + } + + if (HasIcon) Rect.left += Rect.bottom - Rect.top; if((uFlags & DC_TEXT))

1 0

[tkreuzer] 65086: [GDI32] - Move functions to the appropriate source files, zap hacks.c, stubs.c, stubsa.c and stubsw.c (sorry for the noise, but this mess had to be cleaned up)
by tkreuzer＠svn.reactos.org 28 Oct '14

28 Oct '14

Author: tkreuzer Date: Tue Oct 28 21:09:01 2014 New Revision: 65086 URL: http://svn.reactos.org/svn/reactos?rev=65086&view=rev Log: [GDI32] - Move functions to the appropriate source files, zap hacks.c, stubs.c, stubsa.c and stubsw.c (sorry for the noise, but this mess had to be cleaned up) Added: trunk/reactos/win32ss/gdi/gdi32/objects/colorspace.c (with props) trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c (with props) Removed: trunk/reactos/win32ss/gdi/gdi32/misc/hacks.c trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c trunk/reactos/win32ss/gdi/gdi32/misc/stubsa.c trunk/reactos/win32ss/gdi/gdi32/misc/stubsw.c Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/misc/misc.c trunk/reactos/win32ss/gdi/gdi32/misc/wingl.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/brush.c trunk/reactos/win32ss/gdi/gdi32/objects/coord.c trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/gdi32/objects/eng.c trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c trunk/reactos/win32ss/gdi/gdi32/objects/font.c trunk/reactos/win32ss/gdi/gdi32/objects/icm.c trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c trunk/reactos/win32ss/gdi/gdi32/objects/painting.c trunk/reactos/win32ss/gdi/gdi32/objects/palette.c trunk/reactos/win32ss/gdi/gdi32/objects/printdrv.c trunk/reactos/win32ss/gdi/gdi32/objects/text.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… Removed: trunk/reactos/win32ss/gdi/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/hac… Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… Removed: trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/stu… Removed: trunk/reactos/win32ss/gdi/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/stu… Removed: trunk/reactos/win32ss/gdi/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/stu… Modified: trunk/reactos/win32ss/gdi/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/win… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Added: trunk/reactos/win32ss/gdi/gdi32/objects/colorspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Added: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/…

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