Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[jimtabor] 37372: - Fix dirty bit support for select brush and pen, see bug 3863. - Hack-plement part of NtGdiExtFloodFill. We need to fix our region and clip support so ReactOS drawing functions do not over write other displayed windows. Open AbiWord than type something and select another desktop, this is just one of them.... - Tested with Qemu and real hardware.
by jimtabor＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: jimtabor Date: Sat Nov 15 07:37:26 2008 New Revision: 37372 URL: http://svn.reactos.org/svn/reactos?rev=37372&view=rev Log: - Fix dirty bit support for select brush and pen, see bug 3863. - Hack-plement part of NtGdiExtFloodFill. We need to fix our region and clip support so ReactOS drawing functions do not over write other displayed windows. Open AbiWord than type something and select another desktop, this is just one of them.... - Tested with Qemu and real hardware. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -1561,23 +1561,19 @@ return NtGdiSelectBitmap(hDC, hGdiObj); case GDI_OBJECT_TYPE_BRUSH: -#if 0 // enable this when support is ready in win32k hOldObj = pDc_Attr->hbrush; pDc_Attr->ulDirty_ |= DC_BRUSH_DIRTY; pDc_Attr->hbrush = hGdiObj; return hOldObj; -#endif - return NtGdiSelectBrush(hDC, hGdiObj); +// return NtGdiSelectBrush(hDC, hGdiObj); case GDI_OBJECT_TYPE_PEN: case GDI_OBJECT_TYPE_EXTPEN: -#if 0 // enable this when support is ready in win32k hOldObj = pDc_Attr->hpen; pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; pDc_Attr->hpen = hGdiObj; return hOldObj; -#endif - return NtGdiSelectPen(hDC, hGdiObj); +// return NtGdiSelectPen(hDC, hGdiObj); case GDI_OBJECT_TYPE_FONT: hOldObj = pDc_Attr->hlfntNew; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -225,6 +225,9 @@ Dc_Attr = DCDest->pDc_Attr; if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(DCDest,Dc_Attr->hbrush); + /* Offset the destination and source by the origin of their DCs. */ XDest += DCDest->ptlDCOrig.x; YDest += DCDest->ptlDCOrig.y; @@ -484,6 +487,7 @@ * * Someone thought it would be faster to do it here and then switch back * to GDI32. I dunno. Write a test and let me know. + * A. It should be in here! */ static __inline BYTE @@ -781,6 +785,12 @@ } } + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(DCDest,Dc_Attr->hbrush); + /* Offset the destination and source by the origin of their DCs. */ // FIXME: ptlDCOrig is in device coordinates! XOriginDest += DCDest->ptlDCOrig.x; @@ -880,8 +890,6 @@ if (UsesPattern) { - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { @@ -1008,6 +1016,7 @@ int i; PPATRECT r; PGDIBRUSHOBJ BrushObj; + PDC_ATTR Dc_Attr; DC *dc; dc = DC_LockDc(hDC); @@ -1022,6 +1031,12 @@ /* Yes, Windows really returns TRUE in this case */ return TRUE; } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); for (r = pRects, i = 0; i < cRects; i++) { @@ -1074,14 +1089,18 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ return TRUE; } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (BrushObj == NULL) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -130,8 +130,8 @@ NewDC->DC_Type = DC_TYPE_MEMORY; // Always! NewDC->w.hBitmap = NtGdiGetStockObject(DEFAULT_BITMAP); NewDC->pPDev = OrigDC->pPDev; - - NewDC->DcLevel.hpal = OrigDC->DcLevel.hpal; + NewDC->DcLevel.hpal = OrigDC->DcLevel.hpal; + nDc_Attr->lTextAlign = oDc_Attr->lTextAlign; nDc_Attr->ulForegroundClr = oDc_Attr->ulForegroundClr; nDc_Attr->ulBackgroundClr = oDc_Attr->ulBackgroundClr; @@ -1138,6 +1138,13 @@ } Dc_Attr = dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + switch(ObjectType) { case GDI_OBJECT_TYPE_EXTPEN: Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -199,7 +199,7 @@ oldColor = Dc_Attr->crBackgroundClr; Dc_Attr->crBackgroundClr = color; Dc_Attr->ulBackgroundClr = (ULONG)color; - Dc_Attr->ulDirty_ &= ~DIRTY_LINE; // Clear Flag if set. + Dc_Attr->ulDirty_ &= ~(DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); // Clear Flag if set. hBrush = Dc_Attr->hbrush; DC_UnlockDc(dc); NtGdiSelectBrush(hDC, hBrush); @@ -271,6 +271,7 @@ oldColor = Dc_Attr->crForegroundClr; Dc_Attr->crForegroundClr = color; hBrush = Dc_Attr->hbrush; + Dc_Attr->ulDirty_ &= ~(DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); DC_UnlockDc( dc ); NtGdiSelectBrush(hDC, hBrush); return oldColor; Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -94,6 +94,12 @@ DestRect.top = min(DestRect.top, Points[CurrentPoint].y); DestRect.bottom = max(DestRect.bottom, Points[CurrentPoint].y); } + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); /* Special locking order to avoid lock-ups */ FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); @@ -242,6 +248,12 @@ Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); if (NULL == PenBrushObj) { @@ -544,6 +556,12 @@ DestRect.bottom--; } + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + /* Special locking order to avoid lock-ups! */ FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); @@ -702,6 +720,12 @@ Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); if (!PenBrushObj) @@ -1024,10 +1048,95 @@ COLORREF Color, UINT FillType) { - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ - return TRUE; + PDC dc; + PDC_ATTR Dc_Attr; + BITMAPOBJ *BitmapObj = NULL; + PGDIBRUSHOBJ FillBrushObj = NULL; + GDIBRUSHINST FillBrushInst; + BOOL Ret = FALSE; + RECTL DestRect; + POINTL Pt; +// MIX Mix; + + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + Pt.x = XStart; + Pt.y = YStart; + IntLPtoDP(dc, (LPPOINT)&Pt, 1); + + Ret = NtGdiPtInRegion(dc->w.hGCClipRgn, Pt.x, Pt.y); + if (Ret) + IntGdiGetRgnBox(dc->w.hGCClipRgn,(LPRECT)&DestRect); + else + goto cleanup; + + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (!FillBrushObj) + { + Ret = FALSE; + goto cleanup; + } + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (!BitmapObj) + { + Ret = FALSE; + goto cleanup; + } + + if ( FillBrushObj && (FillType == FLOODFILLBORDER)) + { + if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + FillBrushObj->BrushAttr.lbColor = Color; + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + Ret = IntEngBitBlt(&BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &FillBrushInst.BrushObject, + NULL, + ROP3_TO_ROP4(PATCOPY)); + } + } + else + { + } + +cleanup: + if (FillBrushObj) + BRUSHOBJ_UnlockBrush(FillBrushObj); + + if (BitmapObj) + BITMAPOBJ_UnlockBitmap(BitmapObj); + + DC_UnlockDc(dc); + return Ret; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -115,6 +115,12 @@ } else { + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + BitmapObj = BITMAPOBJ_LockBitmap ( dc->w.hBitmap ); if (NULL == BitmapObj) { @@ -257,8 +263,15 @@ PDC_ATTR Dc_Attr = dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if (PATH_IsPathOpen(dc->DcLevel)) return PATH_Polyline(dc, pt, Count); + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); /* Get BRUSHOBJ from current pen. */ PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -1329,7 +1329,9 @@ if (pPath->state != PATH_Closed) return FALSE; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + /* Save the mapping mode info */ mapMode = Dc_Attr->iMapMode; IntGetViewportExtEx(dc, &szViewportExt); @@ -2265,8 +2267,9 @@ STDCALL NtGdiFillPath(HDC hDC) { - BOOL ret = TRUE; + BOOL ret = FALSE; PPATH pPath; + PDC_ATTR pDc_Attr; PDC dc = DC_LockDc ( hDC ); if ( !dc ) @@ -2280,6 +2283,12 @@ DC_UnlockDc ( dc ); return FALSE; } + + pDc_Attr = dc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &dc->Dc_Attr; + + if (pDc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,pDc_Attr->hbrush); ret = PATH_FillPath( dc, pPath ); if ( ret ) @@ -2534,6 +2543,7 @@ NtGdiStrokeAndFillPath(HDC hDC) { DC *pDc; + PDC_ATTR pDc_Attr; PPATH pPath; BOOL bRet = FALSE; @@ -2550,6 +2560,15 @@ DC_UnlockDc ( pDc ); return FALSE; } + + pDc_Attr = pDc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDc->Dc_Attr; + + if (pDc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(pDc,pDc_Attr->hbrush); + if (pDc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(pDc,pDc_Attr->hpen); + bRet = PATH_FillPath(pDc, pPath); if (bRet) bRet = PATH_StrokePath(pDc, pPath); if (bRet) PATH_EmptyPath(pPath); @@ -2564,6 +2583,7 @@ NtGdiStrokePath(HDC hDC) { DC *pDc; + PDC_ATTR pDc_Attr; PPATH pPath; BOOL bRet = FALSE; @@ -2580,6 +2600,12 @@ DC_UnlockDc ( pDc ); return FALSE; } + + pDc_Attr = pDc->pDc_Attr; + if (!pDc_Attr) pDc_Attr = &pDc->Dc_Attr; + + if (pDc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(pDc,pDc_Attr->hpen); bRet = PATH_StrokePath(pDc, pPath); PATH_EmptyPath(pPath); Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sat Nov 15 07:37:26 2008 @@ -260,6 +260,8 @@ XLATEOBJ *XlateObj; BOOLEAN bFailed; + if (pDC == NULL || hPen == NULL) return NULL; + pDc_Attr = pDC->pDc_Attr; if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr;

1 0

[pschweitzer] 37371: Added a stubbed driver for KSecDD
by pschweitzer＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: pschweitzer Date: Sat Nov 15 07:33:13 2008 New Revision: 37371 URL: http://svn.reactos.org/svn/reactos?rev=37371&view=rev Log: Added a stubbed driver for KSecDD Added: branches/pierre-fsd/drivers/filesystems/ksecdd/ (with props) branches/pierre-fsd/drivers/filesystems/ksecdd/dispatch.c (with props) branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.c (with props) branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.h (with props) branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rbuild (with props) branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rc (with props) Modified: branches/pierre-fsd/boot/bootdata/hivesys.inf branches/pierre-fsd/boot/bootdata/packages/reactos.dff branches/pierre-fsd/drivers/filesystems/directory.rbuild Modified: branches/pierre-fsd/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/boot/bootdata/hivesy… ============================================================================== --- branches/pierre-fsd/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ branches/pierre-fsd/boot/bootdata/hivesys.inf [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -939,6 +939,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002 +; KSecDD driver +HKLM,"SYSTEM\CurrentControlSet\Services\KSecDD","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\KSecDD","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\KSecDD","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\KSecDD","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\KSecDD","Type",0x00010001,0x00000001 + ; NTFS filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" Modified: branches/pierre-fsd/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/boot/bootdata/packag… ============================================================================== --- branches/pierre-fsd/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/pierre-fsd/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -365,6 +365,7 @@ drivers\directx\dxgthk\dxgthk.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 +drivers\filesystems\ksecdd\ksecdd.sys 2 drivers\filesystems\msfs\msfs.sys 2 drivers\filesystems\mup\mup.sys 2 drivers\filesystems\npfs\npfs.sys 2 Modified: branches/pierre-fsd/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/directory.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/directory.rbuild [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -9,6 +9,9 @@ </directory> <directory name="fs_rec"> <xi:include href="fs_rec/fs_rec.rbuild" /> +</directory> +<directory name="ksecdd"> + <xi:include href="ksecdd/ksecdd.rbuild" /> </directory> <directory name="msfs"> <xi:include href="msfs/msfs.rbuild" /> Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 15 07:33:13 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/pierre-fsd/drivers/filesystems/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ksecdd/dispatch.c (added) +++ branches/pierre-fsd/drivers/filesystems/ksecdd/dispatch.c [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -1,0 +1,48 @@ +/* + * ReactOS kernel + * Copyright (C) 2008 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/ksecdd/dispatch.c + * PURPOSE: Kernel Security Support Provider Interface + * PROGRAMMER: Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS NTAPI +KsecDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + ASSERT(DeviceObject); + ASSERT(Irp); + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.c (added) +++ branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.c [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -1,0 +1,75 @@ +/* + * ReactOS kernel + * Copyright (C) 2008 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/ksecdd/ksecdd.c + * PURPOSE: Kernel Security Support Provider Interface + * PROGRAMMER: Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS *****************************************************************/ + +PEPROCESS KsecSystemProcess; + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(DEVICE_NAME); + + KsecSystemProcess = PsGetCurrentProcess(); + + KsecInitializeFunctionPointers(DriverObject); + + Status = IoCreateDevice(DriverObject, + 0, + &DeviceName, + FILE_DEVICE_KSEC, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject); + + return Status; +} + +VOID NTAPI +KsecInitializeFunctionPointers(PDRIVER_OBJECT DriverObject) +{ + DriverObject->MajorFunction[IRP_MJ_CREATE] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_READ] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_WRITE] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = KsecDispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL ] = KsecDispatch; + + return; +} Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.h (added) +++ branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.h [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -1,0 +1,20 @@ +#ifndef KSECDD_H +#define KSECDD_H + +#include <ntddk.h> + +#define DEVICE_NAME L"\\Device\\KsecDD" + +/* dispatch.c */ + +NTSTATUS NTAPI +KsecDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +/* ksecdd.c */ + +DRIVER_INITIALIZE DriverEntry; + +VOID NTAPI +KsecInitializeFunctionPointers(PDRIVER_OBJECT DriverObject); + +#endif /* KSECDD_H */ Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rbuild (added) +++ branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rbuild [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ksecdd" type="kernelmodedriver" installbase="system32/drivers" installname="ksecdd.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <include base="ksecdd">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>dispatch.c</file> + <file>ksecdd.c</file> + <file>ksecdd.rc</file> + <pch>ksecdd.h</pch> +</module> Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rc (added) +++ branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rc [iso-8859-1] Sat Nov 15 07:33:13 2008 @@ -1,0 +1,6 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Kernel Security Support Provider Interface\0" +#define REACTOS_STR_INTERNAL_NAME "ksecdd\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ksecdd.sys\0" +#include <reactos/version.rc> Propchange: branches/pierre-fsd/drivers/filesystems/ksecdd/ksecdd.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 37370: RtlCaptureContext can throw an exception. As we need to push the flags on the stack, we need to create unwind info to make sure we can properly unwind. So instead of pushing the flags and then popping them back, push them on the stack at the beginning of the function, reference the location later, clean up the stack at the function end. Also add .cif_adjust_cfa_offset unwind op.
by tkreuzer＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: tkreuzer Date: Fri Nov 14 19:21:50 2008 New Revision: 37370 URL: http://svn.reactos.org/svn/reactos?rev=37370&view=rev Log: RtlCaptureContext can throw an exception. As we need to push the flags on the stack, we need to create unwind info to make sure we can properly unwind. So instead of pushing the flags and then popping them back, push them on the stack at the beginning of the function, reference the location later, clean up the stack at the function end. Also add .cif_adjust_cfa_offset unwind op. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] Fri Nov 14 19:21:50 2008 @@ -23,40 +23,45 @@ _RtlCaptureContext: .cfi_startproc - /* Push eflags */ + /* Push rflags */ pushfq + .cfi_adjust_cfa_offset 8 /* Save the basic register context */ mov [rcx + CONTEXT_Rax], rax mov [rcx + CONTEXT_Rcx], rcx mov [rcx + CONTEXT_Rdx], rdx + + /* Load rflags into rax */ + mov rax, [rsp] + mov [rcx + CONTEXT_Rbx], rbx - - /* pop eflags */ - pop [rcx + CONTEXT_EFlags] - mov [rcx + CONTEXT_Rsi], rsi mov [rcx + CONTEXT_Rdi], rdi + + /* Store rflags */ + mov [rcx + CONTEXT_EFlags], rax + mov [rcx + CONTEXT_Rbp], rbp + mov [rcx + CONTEXT_R8], r8 + mov [rcx + CONTEXT_R9], r9 /* Load former stack pointer in rax */ - lea rax, [rsp + 8] + lea rax, [rsp + 0x10] - mov [rcx + CONTEXT_R8], r8 - mov [rcx + CONTEXT_R9], r9 mov [rcx + CONTEXT_R10], r10 mov [rcx + CONTEXT_R11], r11 + mov [rcx + CONTEXT_R12], r12 /* Store stack pointer */ mov [rcx + CONTEXT_Rsp], rax - mov [rcx + CONTEXT_R12], r12 mov [rcx + CONTEXT_R13], r13 mov [rcx + CONTEXT_R14], r14 mov [rcx + CONTEXT_R15], r15 /* Load return address in rax */ - mov rax, [rsp] + mov rax, [rsp + 8] /* Safe segment selectors */ mov [rcx + CONTEXT_SegCs], cs @@ -87,6 +92,8 @@ movdqa [rcx + CONTEXT_Xmm14], xmm14 movdqa [rcx + CONTEXT_Xmm15], xmm15 */ + /* Cleanup stack and return */ + add rsp, 8 ret .cfi_endproc .endfunc

1 0

[sginsberg] 37369: - Fix another duplicate
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 17:27:10 2008 New Revision: 37369 URL: http://svn.reactos.org/svn/reactos?rev=37369&view=rev Log: - Fix another duplicate Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3736… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Nov 14 17:27:10 2008 @@ -287,8 +287,6 @@ #define KSINTERFACE_STANDARD_LOOPED_STREAMING #define KSINTERFACE_STANDARD_CONTROL #endif - -typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; #define STATIC_KSINTERFACESETID_Standard \ 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00

1 0

[sginsberg] 37368: - Remove more duplicate definitions - Make definitions compatible when they are present in multiple headers
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 17:23:30 2008 New Revision: 37368 URL: http://svn.reactos.org/svn/reactos?rev=37368&view=rev Log: - Remove more duplicate definitions - Make definitions compatible when they are present in multiple headers Modified: trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/callback.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -126,9 +126,6 @@ #define SHGFI_SHELLICONSIZE 4 #define SHGFI_PIDL 8 #define SHGFI_USEFILEATTRIBUTES 16 -#define SHERB_NOCONFIRMATION 1 -#define SHERB_NOPROGRESSUI 2 -#define SHERB_NOSOUND 4 typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -850,7 +850,7 @@ typedef enum _STREAM_INFO_LEVELS { FindStreamInfoStandard } STREAM_INFO_LEVELS; -typedef struct _WIN32_FIND_STREAM_DATAW { +typedef struct _WIN32_FIND_STREAM_DATA { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; @@ -1085,9 +1085,6 @@ typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; typedef void(APIENTRY *PAPCFUNC)(ULONG_PTR); typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); -#if (_WIN32_WINNT >= 0x0500) -typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); -#endif #if (_WIN32_WINNT >= 0x0600) typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #endif @@ -2196,9 +2193,6 @@ #ifdef UNICODE typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA; -#if (_WIN32_WINNT >= 0x0501) -typedef WIN32_FIND_STREAM_DATA WIN32_FIND_STREAM_DATA,*LPWIN32_FIND_STREAM_DATA; -#endif typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; typedef ENUMRESLANGPROCW ENUMRESLANGPROC; typedef ENUMRESNAMEPROCW ENUMRESNAMEPROC; Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -167,7 +167,9 @@ #define WC_DEFAULTCHAR 0x0040 #define WC_ERR_INVALID_CHARS 0x0080 #define WC_COMPOSITECHECK 0x0200 +#if (WINVER >= 0x0500) #define WC_NO_BEST_FIT_CHARS 0x0400 +#endif #define CP_ACP 0 #define CP_OEMCP 1 @@ -426,7 +428,6 @@ #define DATE_LTRREADING 16 #define DATE_RTLREADING 32 #define MAP_EXPAND_LIGATURES 0x2000 -#define WC_NO_BEST_FIT_CHARS 1024 #define CAL_SYEARMONTH 47 #define CAL_ITWODIGITYEARMAX 48 #define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -2837,7 +2837,7 @@ PVOID ExceptionAddress; DWORD NumberParameters; ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD, *PEXCEPTION_RECORD, *LPEXCEPTION_RECORD; + } EXCEPTION_RECORD; typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; @@ -3864,7 +3864,6 @@ WORD OffsetModuleName; WORD Reserved; } IMAGE_BOUND_FORWARDER_REF,*PIMAGE_BOUND_FORWARDER_REF; -typedef void(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID,DWORD,PVOID); typedef struct _IMAGE_RESOURCE_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; @@ -4381,9 +4380,6 @@ ProcessorPowerPolicyCurrent } POWER_INFORMATION_LEVEL; -#if (_WIN32_WINNT >= 0x0500) -typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS); -#endif #if 1 /* (WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -1779,14 +1779,6 @@ #define WM_CHANGEUISTATE 295 #define WM_UPDATEUISTATE 296 #define WM_QUERYUISTATE 297 -#define UIS_SET 1 -#define UIS_CLEAR 2 -#define UIS_INITIALIZE 3 -#define UISF_HIDEFOCUS 1 -#define UISF_HIDEACCEL 2 -#if(_WIN32_WINNT >= 0x0501) -#define UISF_ACTIVE 4 -#endif /* _WIN32_WINNT >= 0x0501 */ #endif /* _WIN32_WINNT >= 0x0500 */ #endif /* _WIN32_WCE */ #define BM_CLICK 245 @@ -2470,14 +2462,10 @@ #define HBMMENU_POPUP_RESTORE ((HBITMAP)9) #define HBMMENU_POPUP_MAXIMIZE ((HBITMAP)10) #define HBMMENU_POPUP_MINIMIZE ((HBITMAP)11) -#define MOD_ALT 1 -#define MOD_CONTROL 2 -#define MOD_SHIFT 4 -#define MOD_WIN 8 -#define MOD_IGNORE_ALL_MODIFIER 1024 -#define MOD_ON_KEYUP 2048 -#define MOD_RIGHT 16384 -#define MOD_LEFT 32768 +#define MOD_ALT 0x0001 +#define MOD_CONTROL 0x0002 +#define MOD_SHIFT 0x0004 +#define MOD_WIN 0x0008 #define LLKHF_EXTENDED 0x00000001 #define LLKHF_INJECTED 0x00000010 #define LLKHF_ALTDOWN 0x00000020 @@ -2643,10 +2631,10 @@ #define RIM_TYPEMOUSE 0x00000000 #define RIM_TYPEKEYBOARD 0x00000001 #define RIM_TYPEHID 0x00000002 -#define MOUSE_MOVE_RELATIVE 0x00000000 -#define MOUSE_MOVE_ABSOLUTE 0x00000001 -#define MOUSE_VIRTUAL_DESKTOP 0x00000002 -#define MOUSE_ATTRIBUTES_CHANGED 0x00000004 +#define MOUSE_MOVE_RELATIVE 0 +#define MOUSE_MOVE_ABSOLUTE 1 +#define MOUSE_VIRTUAL_DESKTOP 0x02 +#define MOUSE_ATTRIBUTES_CHANGED 0x04 #define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 #define RI_MOUSE_LEFT_BUTTON_UP 0x0002 #define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 @@ -2869,7 +2857,6 @@ short cx; short cy; } DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW; -typedef const DLGTEMPLATE *LPCDLGTEMPLATE; typedef const DLGTEMPLATE *LPCDLGTEMPLATEA; typedef const DLGTEMPLATE *LPCDLGTEMPLATEW; #ifdef UNICODE Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -51,8 +51,6 @@ /* WCHAR szClass[] */ } HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS, *PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS; -typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); - typedef struct _EVENTPROC_CALLBACK_ARGUMENTS { HWINEVENTHOOK hook;

1 0

[sginsberg] 37367: - Remove duplicate definition
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 17:05:40 2008 New Revision: 37367 URL: http://svn.reactos.org/svn/reactos?rev=37367&view=rev Log: - Remove duplicate definition Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=3… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Fri Nov 14 17:05:40 2008 @@ -18,8 +18,6 @@ #include <wine/list.h> /* FUNCTIONS ***************************************************************/ - -typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); HANDLE TimerThreadHandle = NULL;

1 0

[janderwald] 37366: - Improve function stubs - bug 3829
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 15:03:48 2008 New Revision: 37366 URL: http://svn.reactos.org/svn/reactos?rev=37366&view=rev Log: - Improve function stubs - bug 3829 Modified: trunk/reactos/dll/win32/winspool/stubs.c Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Fri Nov 14 15:03:48 2008 @@ -620,6 +620,8 @@ EnumFormsA(HANDLE Printer, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumFormsA stub called\n"); + *Needed = 0; + *Returned = 0; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -634,6 +636,8 @@ EnumFormsW(HANDLE Printer, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumFormsW stub called\n"); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -647,6 +651,9 @@ EnumJobsA(HANDLE Printer, DWORD First, DWORD NoJobs, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumJobsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -661,6 +668,9 @@ EnumJobsW(HANDLE Printer, DWORD First, DWORD NoJobs, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumJobsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -675,6 +685,9 @@ EnumMonitorsA(LPSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumMonitorsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -689,6 +702,9 @@ EnumMonitorsW(LPWSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumMonitorsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -703,6 +719,9 @@ EnumPortsA(LPSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumPortsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -717,6 +736,9 @@ EnumPortsW(LPWSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumPortsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -758,6 +780,8 @@ { OutputDebugStringW(L"winspool EnumPrinterDriversA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -772,6 +796,8 @@ { OutputDebugStringW(L"winspool EnumPrinterDriversW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -786,6 +812,8 @@ { OutputDebugStringW(L"winspool EnumPrintersA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -800,6 +828,8 @@ { OutputDebugStringW(L"winspool EnumPrintersW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -814,6 +844,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorDatatypesA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -828,6 +860,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorDatatypesW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -842,6 +876,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorsA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -856,6 +892,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorsW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; }

1 0

[janderwald] 37365: - Make trash properties settings be unvolatile ; ) See issue #3786 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 14:58:27 2008 New Revision: 37365 URL: http://svn.reactos.org/svn/reactos?rev=37365&view=rev Log: - Make trash properties settings be unvolatile ;) See issue #3786 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Fri Nov 14 14:58:27 2008 @@ -1287,7 +1287,7 @@ DWORD dwSize; - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return FALSE; iCount = ListView_GetItemCount(hDlgCtrl);

1 0

[janderwald] 37364: - Display Provider and Version in driver details dialog
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:57:22 2008 New Revision: 37364 URL: http://svn.reactos.org/svn/reactos?rev=37364&view=rev Log: - Display Provider and Version in driver details dialog Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Fri Nov 14 13:57:22 2008 @@ -162,6 +162,26 @@ &DriverInfoData)) { HSPFILEQ queueHandle; + DWORD HiVal, LoVal; + WCHAR szTime[25]; + + HiVal = (DriverInfoData.DriverVersion >> 32); + if (HiVal) + { + swprintf (szTime, L"%d.%d", HIWORD(HiVal), LOWORD(HiVal)); + LoVal = (DriverInfoData.DriverVersion & 0xFFFFFFFF); + if (HIWORD(LoVal)) + { + swprintf(&szTime[wcslen(szTime)], L".%d", HIWORD(LoVal)); + if (LOWORD(LoVal)) + { + swprintf(&szTime[wcslen(szTime)], L".%d", LOWORD(LoVal)); + } + } + SetDlgItemTextW(hwndDlg, IDC_FILEVERSION, szTime); + } + SetDlgItemText(hwndDlg, IDC_FILEPROVIDER, DriverInfoData.ProviderName); + queueHandle = SetupOpenFileQueue(); if (queueHandle != (HSPFILEQ)INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Fri Nov 14 13:57:22 2008 @@ -6,6 +6,7 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> +#include <stdio.h> #include <dll/devmgr/devmgr.h> #include "resource.h"

1 0

[janderwald] 37363: - Create IDataObject from the selected pidl - Check if drop target is the desktop - fixes bug 3763
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:48:46 2008 New Revision: 37363 URL: http://svn.reactos.org/svn/reactos?rev=37363&view=rev Log: - Create IDataObject from the selected pidl - Check if drop target is the desktop - fixes bug 3763 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Nov 14 13:48:46 2008 @@ -1054,9 +1054,19 @@ return E_FAIL; } - IShellFolder_Release(psfDesktop); - - if (FAILED(IShellFolder_BindToObject(This->dcm.psf, This->dcm.apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&psfTarget))) + if (This->dcm.cidl) + { + IShellFolder_Release(psfDesktop); + hr = IShellFolder_BindToObject(This->dcm.psf, This->dcm.apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&psfTarget); + } + else + { + /* target folder is desktop because cidl is zero */ + psfTarget = psfDesktop; + hr = S_OK; + } + + if (FAILED(hr)) { ERR("no IShellFolder\n"); @@ -1309,8 +1319,15 @@ { LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; - LPDATAOBJECT lpDo; + LPDATAOBJECT pDataObj; HRESULT hr; + + if (SUCCEEDED(SHCreateDataObject(iface->dcm.pidlFolder, iface->dcm.cidl, iface->dcm.apidl, NULL, &IID_IDataObject, (void**)&pDataObj))) + { + hr = OleSetClipboard(pDataObj); + IDataObject_Release(pDataObj); + return hr; + } lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0); if (!lpSB) @@ -1326,19 +1343,19 @@ return hr; } - hr = IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&lpDo); + hr = IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&pDataObj); if (FAILED(hr)) { TRACE("failed to get item object\n"); return hr; } - hr = OleSetClipboard(lpDo); + hr = OleSetClipboard(pDataObj); if (FAILED(hr)) { WARN("OleSetClipboard failed"); } - IDataObject_Release(lpDo); + IDataObject_Release(pDataObj); IShellView_Release(lpSV); return S_OK; }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008