Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37347: - Remove duplicate define
by sginsberg＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: sginsberg Date: Thu Nov 13 17:59:37 2008 New Revision: 37347 URL: http://svn.reactos.org/svn/reactos?rev=37347&view=rev Log: - Remove duplicate define Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Nov 13 17:59:37 2008 @@ -2644,8 +2644,6 @@ (_advhdr)->FileContextSupportPointer = NULL; \ } -#define FlagOn(x, f) ((x) & (f)) - NTKERNELAPI VOID NTAPI

1 0

[jimtabor] 37346: - Start the implementation and support for dc attribute dirty bits. See bug 3863.
by jimtabor＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: jimtabor Date: Thu Nov 13 17:12:42 2008 New Revision: 37346 URL: http://svn.reactos.org/svn/reactos?rev=37346&view=rev Log: - Start the implementation and support for dc attribute dirty bits. See bug 3863. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -268,6 +268,8 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PGDIDEVICE, PDEVCAPS); +HPEN FASTCALL IntGdiSelectPen(PDC,HPEN); +HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH); extern PGDIDEVICE pPrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -199,6 +199,7 @@ int YEndArc) { BOOL Ret; + PDC_ATTR pDc_Attr; DPRINT("StartX: %d, StartY: %d, EndX: %d, EndY: %d\n", XStartArc,YStartArc,XEndArc,YEndArc); @@ -220,6 +221,15 @@ YEndArc, arctype); } + + 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); + + if (pDc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,pDc_Attr->hpen); if (arctype == GdiTypeArcTo) { Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Thu Nov 13 17:12:42 2008 @@ -508,6 +508,52 @@ return hBrush; } + +HBRUSH +FASTCALL +IntGdiSelectBrush( + PDC pDC, + HBRUSH hBrush) +{ + PDC_ATTR pDc_Attr; + HBRUSH hOrgBrush; + PGDIBRUSHOBJ pBrush; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + if (pDC == NULL || hBrush == NULL) return NULL; + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pBrush = BRUSHOBJ_LockBrush(hBrush); + if (pBrush == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed); + BRUSHOBJ_UnlockBrush(pBrush); + if(bFailed) + { + return NULL; + } + + hOrgBrush = pDc_Attr->hbrush; + pDc_Attr->hbrush = hBrush; + + if (pDC->XlateBrush != NULL) + { + EngDeleteXlate(pDC->XlateBrush); + } + pDC->XlateBrush = XlateObj; + + pDc_Attr->ulDirty_ &= ~DC_BRUSH_DIRTY; + + return hOrgBrush; +} + /* PUBLIC FUNCTIONS ***********************************************************/ @@ -656,4 +702,31 @@ BRUSHOBJ_UnlockBrush(BrushObject); } + /* + * @implemented + */ +HBRUSH +APIENTRY +NtGdiSelectBrush( + IN HDC hDC, + IN HBRUSH hBrush) +{ + PDC pDC; + HBRUSH hOrgBrush; + + if (hDC == NULL || hBrush == NULL) return NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + hOrgBrush = IntGdiSelectBrush(pDC,hBrush); + + DC_UnlockDc(pDC); + + return hOrgBrush; +} + /* EOF */ 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] Thu Nov 13 17:12:42 2008 @@ -2142,61 +2142,6 @@ /* * @implemented */ -HBRUSH -APIENTRY -NtGdiSelectBrush( - IN HDC hDC, - IN HBRUSH hBrush) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - HBRUSH hOrgBrush; - PGDIBRUSHOBJ pBrush; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; - - if (hDC == NULL || hBrush == NULL) return NULL; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - return NULL; - } - - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - pBrush = BRUSHOBJ_LockBrush(hBrush); - if (pBrush == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - DC_UnlockDc(pDC); - return NULL; - } - - XlateObj = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed); - BRUSHOBJ_UnlockBrush(pBrush); - if(bFailed) - { - DC_UnlockDc(pDC); - return NULL; - } - - hOrgBrush = pDc_Attr->hbrush; - pDc_Attr->hbrush = hBrush; - if (pDC->XlateBrush != NULL) - { - EngDeleteXlate(pDC->XlateBrush); - } - pDC->XlateBrush = XlateObj; - - DC_UnlockDc(pDC); - return hOrgBrush; -} - - /* - * @implemented - */ HFONT APIENTRY NtGdiSelectFont( @@ -2228,60 +2173,6 @@ DC_UnlockDc(pDC); return hOrgFont; -} - - /* - * @implemented - */ -HPEN -APIENTRY -NtGdiSelectPen( - IN HDC hDC, - IN HPEN hPen) -{ - PDC pDC; - PDC_ATTR pDc_Attr; - HPEN hOrgPen = NULL; - PGDIBRUSHOBJ pPen; - XLATEOBJ *XlateObj; - BOOLEAN bFailed; - - if (hDC == NULL || hPen == NULL) return NULL; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - return NULL; - } - - pDc_Attr = pDC->pDc_Attr; - if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; - - pPen = PENOBJ_LockPen(hPen); - if (pPen == NULL) - { - return NULL; - } - - XlateObj = IntGdiCreateBrushXlate(pDC, pPen, &bFailed); - PENOBJ_UnlockPen(pPen); - if (bFailed) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return NULL; - } - - hOrgPen = pDc_Attr->hpen; - pDc_Attr->hpen = hPen; - if (pDC->XlatePen != NULL) - { - EngDeleteXlate(pDC->XlatePen); - } - pDC->XlatePen = XlateObj; - - DC_UnlockDc(pDC); - - return hOrgPen; } HPALETTE 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] Thu Nov 13 17:12:42 2008 @@ -247,6 +247,50 @@ return cbRetCount; } + +HPEN +FASTCALL +IntGdiSelectPen( + PDC pDC, + HPEN hPen) +{ + PDC_ATTR pDc_Attr; + HPEN hOrgPen = NULL; + PGDIBRUSHOBJ pPen; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pPen = PENOBJ_LockPen(hPen); + if (pPen == NULL) + { + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pPen, &bFailed); + PENOBJ_UnlockPen(pPen); + if (bFailed) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return NULL; + } + + hOrgPen = pDc_Attr->hpen; + pDc_Attr->hpen = hPen; + + if (pDC->XlatePen != NULL) + { + EngDeleteXlate(pDC->XlatePen); + } + pDc_Attr->ulDirty_ &= ~DC_PEN_DIRTY; + + pDC->XlatePen = XlateObj; + + return hOrgPen; +} + /* PUBLIC FUNCTIONS ***********************************************************/ HPEN STDCALL @@ -346,5 +390,31 @@ return hPen; } + /* + * @implemented + */ +HPEN +APIENTRY +NtGdiSelectPen( + IN HDC hDC, + IN HPEN hPen) +{ + PDC pDC; + HPEN hOrgPen; + + if (hDC == NULL || hPen == NULL) return NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + hOrgPen = IntGdiSelectPen(pDC,hPen); + + DC_UnlockDc(pDC); + + return hOrgPen; +} /* EOF */

1 0

[jimtabor] 37345: - Add path support for ExtTextOut.
by jimtabor＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: jimtabor Date: Thu Nov 13 16:38:16 2008 New Revision: 37345 URL: http://svn.reactos.org/svn/reactos?rev=37345&view=rev Log: - Add path support for ExtTextOut. Modified: trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] Thu Nov 13 16:38:16 2008 @@ -67,6 +67,7 @@ BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); BOOL FASTCALL PATH_PathToRegion (PPATH pPath, INT nPolyFillMode, HRGN *pHrgn); +BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECT *lprc,LPCWSTR str,UINT count,const INT *dx); VOID FASTCALL IntGdiCloseFigure(PPATH pPath); BOOL FASTCALL PATH_Delete(HPATH hPath); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Nov 13 16:38:16 2008 @@ -3162,36 +3162,51 @@ Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); if (! NT_SUCCESS(Status)) { - goto fail; + goto fail; } } String = SafeString; - if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) - { - // At least one of the two flags were specified. Copy lprc. Once. + if (NULL != UnsafeDx && Count > 0) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); + if (NULL == Dx) + { + goto fail; + } + Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); + if (!NT_SUCCESS(Status)) + { + goto fail; + } + } + + if (lprc) + { Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); if (!NT_SUCCESS(Status)) { - DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } + goto fail; + } + } + + if (PATH_IsPathOpen(dc->DcLevel)) + { + if (!PATH_ExtTextOut( dc, + XStart, + YStart, + fuOptions, + (const RECT *)&SpecifiedDestRect, + SafeString, + Count, + (const INT *)Dx)) goto fail; + goto good; + } + + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) + { IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); - } - - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); @@ -3636,13 +3651,14 @@ } BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); +good: if (NULL != SafeString) { - ExFreePool((void*)SafeString); + ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } DC_UnlockDc( dc ); @@ -3669,11 +3685,11 @@ } if (NULL != SafeString) { - ExFreePool((void*)SafeString); + ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } DC_UnlockDc(dc); 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] Thu Nov 13 16:38:16 2008 @@ -1854,6 +1854,239 @@ return ret; } +static inline INT int_from_fixed(FIXED f) +{ + return (f.fract >= 0x8000) ? (f.value + 1) : f.value; +} + +/********************************************************************** + * PATH_BezierTo + * + * internally used by PATH_add_outline + */ +static +VOID +FASTCALL +PATH_BezierTo(PPATH pPath, POINT *lppt, INT n) +{ + if (n < 2) return; + + if (n == 2) + { + PATH_AddEntry(pPath, &lppt[1], PT_LINETO); + } + else if (n == 3) + { + PATH_AddEntry(pPath, &lppt[0], PT_BEZIERTO); + PATH_AddEntry(pPath, &lppt[1], PT_BEZIERTO); + PATH_AddEntry(pPath, &lppt[2], PT_BEZIERTO); + } + else + { + POINT pt[3]; + INT i = 0; + + pt[2] = lppt[0]; + n--; + + while (n > 2) + { + pt[0] = pt[2]; + pt[1] = lppt[i+1]; + pt[2].x = (lppt[i+2].x + lppt[i+1].x) / 2; + pt[2].y = (lppt[i+2].y + lppt[i+1].y) / 2; + PATH_BezierTo(pPath, pt, 3); + n--; + i++; + } + + pt[0] = pt[2]; + pt[1] = lppt[i+1]; + pt[2] = lppt[i+2]; + PATH_BezierTo(pPath, pt, 3); + } +} + +static +BOOL +FASTCALL +PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size) +{ + PPATH pPath; + TTPOLYGONHEADER *start; + POINT pt; + + start = header; + + pPath = PATH_LockPath(dc->DcLevel.hPath); + { + return FALSE; + } + + while ((char *)header < (char *)start + size) + { + TTPOLYCURVE *curve; + + if (header->dwType != TT_POLYGON_TYPE) + { + DPRINT1("Unknown header type %d\n", header->dwType); + return FALSE; + } + + pt.x = x + int_from_fixed(header->pfxStart.x); + pt.y = y - int_from_fixed(header->pfxStart.y); + IntLPtoDP(dc, &pt, 1); + PATH_AddEntry(pPath, &pt, PT_MOVETO); + + curve = (TTPOLYCURVE *)(header + 1); + + while ((char *)curve < (char *)header + header->cb) + { + /*DPRINT1("curve->wType %d\n", curve->wType);*/ + + switch(curve->wType) + { + case TT_PRIM_LINE: + { + WORD i; + + for (i = 0; i < curve->cpfx; i++) + { + pt.x = x + int_from_fixed(curve->apfx[i].x); + pt.y = y - int_from_fixed(curve->apfx[i].y); + IntLPtoDP(dc, &pt, 1); + PATH_AddEntry(pPath, &pt, PT_LINETO); + } + break; + } + + case TT_PRIM_QSPLINE: + case TT_PRIM_CSPLINE: + { + WORD i; + POINTFX ptfx; + POINT *pts = ExAllocatePoolWithTag(PagedPool, (curve->cpfx + 1) * sizeof(POINT), TAG_PATH); + + if (!pts) return FALSE; + + ptfx = *(POINTFX *)((char *)curve - sizeof(POINTFX)); + + pts[0].x = x + int_from_fixed(ptfx.x); + pts[0].y = y - int_from_fixed(ptfx.y); + IntLPtoDP(dc, &pts[0], 1); + + for (i = 0; i < curve->cpfx; i++) + { + pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x); + pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y); + IntLPtoDP(dc, &pts[i + 1], 1); + } + + PATH_BezierTo(pPath, pts, curve->cpfx + 1); + + ExFreePoolWithTag(pts, TAG_PATH); + break; + } + + default: + DPRINT1("Unknown curve type %04x\n", curve->wType); + return FALSE; + } + + curve = (TTPOLYCURVE *)&curve->apfx[curve->cpfx]; + } + header = (TTPOLYGONHEADER *)((char *)header + header->cb); + } + + IntGdiCloseFigure( pPath ); + PATH_UnlockPath( pPath ); + return TRUE; +} + +/********************************************************************** + * PATH_ExtTextOut + */ +BOOL +FASTCALL +PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECT *lprc, + LPCWSTR str, UINT count, const INT *dx) +{ + unsigned int idx; + double cosEsc, sinEsc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + LOGFONTW lf; + POINTL org; + INT offset = 0, xoff = 0, yoff = 0; + + if (!count) return TRUE; + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + TextObj = RealizeFontInit( Dc_Attr->hlfntNew); + if ( !TextObj ) return FALSE; + + FontGetObject( TextObj, sizeof(lf), &lf); + + if (lf.lfEscapement != 0) + { + cosEsc = cos(lf.lfEscapement * M_PI / 1800); + sinEsc = sin(lf.lfEscapement * M_PI / 1800); + } else + { + cosEsc = 1; + sinEsc = 0; + } + + IntGdiGetDCOrg(dc, &org); + + for (idx = 0; idx < count; idx++) + { + GLYPHMETRICS gm; + DWORD dwSize; + void *outline; + + dwSize = ftGdiGetGlyphOutline( dc, + str[idx], + GGO_GLYPH_INDEX | GGO_NATIVE, + &gm, + 0, + NULL, + NULL, + TRUE); + if (!dwSize) return FALSE; + + outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH); + if (!outline) return FALSE; + + ftGdiGetGlyphOutline( dc, + str[idx], + GGO_GLYPH_INDEX | GGO_NATIVE, + &gm, + dwSize, + outline, + NULL, + TRUE); + + PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); + + ExFreePoolWithTag(outline, TAG_PATH); + + if (dx) + { + offset += dx[idx]; + xoff = offset * cosEsc; + yoff = offset * -sinEsc; + } + else + { + xoff += gm.gmCellIncX; + yoff += gm.gmCellIncY; + } + } + return TRUE; +} /***********************************************************************

1 0

[dreimer] 37344: Further work on PS files. Last problems left: - raddr2line fails - ssvn status fails
by dreimer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: dreimer Date: Thu Nov 13 14:16:33 2008 New Revision: 37344 URL: http://svn.reactos.org/svn/reactos?rev=37344&view=rev Log: Further work on PS files. Last problems left: - raddr2line fails - ssvn status fails Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -24,7 +24,7 @@ # If Parameters were set, parse them, if not, ask the user to add them. # $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " - if ($_1 -eq $null) { + if ($_1.length -eq 0) { "ERROR: You must enter a Architecture." } } else { @@ -46,7 +46,7 @@ $_ROSBE_ARCH = 3 SYSPARAM } -elseif ($_1 -eq $null) { +else { "Unknown parameter specified. Try 'help [COMMAND]'." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -19,7 +19,7 @@ # If Parameters were set, parse them, if not, ask the user to add them. # $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " - if ($_1 -eq $null) { + if ($_1.length -eq 0) { "ERROR: You must enter a ReactOS source directory, or 'previous'." } } else { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -11,46 +11,47 @@ $host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." } +function settitle { + if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + } + exit +} + function EOA { IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" -} - -function INTERACTIVE { - $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " - if ($_1 -eq $null) { - "ERROR: You must enter a MinGW/GCC directory." - } - $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " - if ($_2 -eq $null) { - "ERROR: You must enter ""target"" or ""host""." - } -} -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + settitle } # # Parse the command line arguments. # $_1 = $args[0] -"$_1" -$_1 = IEX "& '$_ROSBE_BASEDIR\Tools\rquote.exe' '$_1'" $_2 = $args[1] if ($_1 -eq $null) { - INTERACTIVE + $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " + if ($_1.length -eq 0) { + "ERROR: You must enter a MinGW/GCC directory." + settitle + } } if ($_2 -eq $null) { - INTERACTIVE + $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " + if ($_2.length -eq 0) { + "ERROR: You must enter ""target"" or ""host""." + settitle + } } - if (Test-Path "$_ROSBE_BASEDIR\$_1\.") { $_1 = "$_ROSBE_BASEDIR\$_1" } elseif (!(Test-Path "$_1\.")) { "ERROR: The path specified doesn't seem to exist." + settitle } if (!(Test-Path "$_1\bin\*gcc.exe")) { "ERROR: No MinGW/GCC found in the specified path." + settitle } if ($_2 -eq "target") { @@ -64,6 +65,7 @@ EOA } else { "ERROR: You specified wrong parameters." + settitle } # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -13,9 +13,7 @@ # Run options.exe # if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { - pushd "$_ROSBE_BASEDIR" - & "$_ROSBE_BASEDIR\Tools\options.exe" - popd + & "$_ROSBE_BASEDIR\Tools\options.exe" | out-null if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { & "$ENV:APPDATA\RosBE\rosbe-options.cmd" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -15,7 +15,7 @@ "Your tree is not up to date. Do you want to update it?" $UP = Read-Host "Please enter 'yes' or 'no': " if ($UP -eq "yes") { - IEX "'$_ROSBE_BASEDIR\ssvn' update" + IEX "&'$_ROSBE_BASEDIR\ssvn' update" } } if ($OFFSVN -eq $ONSVN) { @@ -38,16 +38,17 @@ "This might take a while, so please be patient." "" if ($args[1] -ne $null) { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $args[1]" + $temparg = $args[1] + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" } else { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update" + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" } } elseif ($args[0] -eq "cleanup") { $host.ui.RawUI.WindowTitle = "SVN Cleaning..." "This might take a while, so please be patient." "" - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" } # @@ -58,9 +59,9 @@ if (Test-Path ".svn\.") { "ERROR: Folder already contains a repository." } else { - dir /b 2>nul | findstr "." >nul - if (errorlevel -eq 1) { - IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + $dir = dir + if ($dir -eq $null) { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } @@ -75,8 +76,8 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" - $ONSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" UP } @@ -94,3 +95,5 @@ $OFFSVN = $null $ONSVN = $null $UP = $null +$dir = dir +$temparg = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Thu Nov 13 14:16:33 2008 @@ -8,9 +8,12 @@ # Peter Ward <dralnix(a)gmail.com> # -function paramcall { - $OUT = IEX "'$_ROSBE_BASEDIR\Tools\scut.exe' $args" +function paramcall($arg) { + IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' $arg" +} +function parse($arg) { + $OUT = paramcall($arg) # It's a shortcut name, so change the directory if ($OUT -ne "Default") { @@ -22,14 +25,15 @@ } # Check if the parameter is an scut parameter, which can just be forwarded to the EXE file -if ($args[0] -eq "add") {paramcall} -if ($args[0] -eq "rem") {paramcall} -if ($args[0] -eq "edit") {paramcall} -if ($args[0] -eq "def") {paramcall} -if ($args[0] -eq "list") {paramcall} -if ($args[0] -eq "/?") {paramcall} -if ($args[0] -eq "-h") {paramcall} -if ($args[0] -eq "--help") {paramcall} +if ($args[0] -eq "add") {paramcall($args)} +elseif ($args[0] -eq "rem") {paramcall($args)} +elseif ($args[0] -eq "edit") {paramcall($args)} +elseif ($args[0] -eq "def") {paramcall($args)} +elseif ($args[0] -eq "list") {paramcall($args)} +elseif ($args[0] -eq "/?") {paramcall($args)} +elseif ($args[0] -eq "-h") {paramcall($args)} +elseif ($args[0] -eq "--help") {paramcall($args)} +else {parse($args)} if ($_ROSBE_VERSION -ne $null) { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

1 0

[greatlrd] 37343: Bugfix : Do not link to LPDDRAWI_DIRECTDRAW_INT->lpLink when we do not have any LPDDRAWI_DIRECTDRAW_INT->lpLcl
by greatlrd＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: greatlrd Date: Thu Nov 13 13:52:20 2008 New Revision: 37343 URL: http://svn.reactos.org/svn/reactos?rev=37343&view=rev Log: Bugfix : Do not link to LPDDRAWI_DIRECTDRAW_INT->lpLink when we do not have any LPDDRAWI_DIRECTDRAW_INT->lpLcl Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Thu Nov 13 13:52:20 2008 @@ -33,8 +33,8 @@ This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; - /* fixme linking too second link when we shall not doing it */ - if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) + if ( (IsBadWritePtr(This,sizeof(LPDDRAWI_DIRECTDRAW_INT)) != 0) || + (IsBadWritePtr(This->lpLcl,sizeof(LPDDRAWI_DIRECTDRAW_LCL)) != 0) ) { /* We do not have a DirectDraw interface, we need alloc it*/ LPDDRAWI_DIRECTDRAW_INT memThis;

1 0

[cgutman] 37342: - Split NdisRegisterProtocol so I can reuse the code for NdisReEnumerateProtocolBindings - Move NdisReEnumerateProtocolBindings into protocol.c - Implement NdisReEnumerateProtocolBindings
by cgutman＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: cgutman Date: Thu Nov 13 13:52:11 2008 New Revision: 37342 URL: http://svn.reactos.org/svn/reactos?rev=37342&view=rev Log: - Split NdisRegisterProtocol so I can reuse the code for NdisReEnumerateProtocolBindings - Move NdisReEnumerateProtocolBindings into protocol.c - Implement NdisReEnumerateProtocolBindings Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Nov 13 13:52:11 2008 @@ -609,6 +609,151 @@ *Status = NDIS_STATUS_SUCCESS; } +VOID +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +{ + /* + * bind the protocol to all of its miniports + * + * open registry path + * get list of devices from Bind key + * call BindAdapterHandler for each + */ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RegistryPath; + WCHAR *RegistryPathStr; + NTSTATUS NtStatus; + WCHAR *DataPtr; + HANDLE DriverKeyHandle = NULL; + PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; + + RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); + RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; + wcscat(RegistryPathStr, LINKAGE_KEY); + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); + + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); + + ExFreePool(RegistryPathStr); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); + + { + UNICODE_STRING ValueName; + ULONG ResultLength; + + RtlInitUnicodeString(&ValueName, L"Bind"); + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); + if(!KeyInformation) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ZwClose(DriverKeyHandle); + *Status = NDIS_STATUS_FAILURE; + return; + } + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + + ZwClose(DriverKeyHandle); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_FAILURE; + return; + } + } + + for (DataPtr = (WCHAR *)KeyInformation->Data; + *DataPtr != 0; + DataPtr += wcslen(DataPtr) + 1) + { + /* BindContext is for tracking pending binding operations */ + VOID *BindContext = 0; + NDIS_STRING DeviceName; + NDIS_STRING RegistryPath; + WCHAR *RegistryPathStr = NULL; + ULONG PathLength = 0; + + RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ + + /* + * RegistryPath should be: + * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip + * + * This is constructed as follows: + * SERVICES_KEY + extracted device name + Protocol name from characteristics + */ + + PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ + wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ + sizeof(PARAMETERS_KEY) + /* \Parameters\ */ + ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ + + RegistryPathStr = ExAllocatePool(PagedPool, PathLength); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcscat(RegistryPathStr, DataPtr + 8 ); + wcscat(RegistryPathStr, PARAMETERS_KEY); + wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); + + RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + + NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", + &DeviceName, &RegistryPath)); + + { + BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; + if(BindHandler) + BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); + else + NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); + } + } + + *Status = NDIS_STATUS_SUCCESS; + ExFreePool(KeyInformation); +} /* * @implemented @@ -640,9 +785,6 @@ PPROTOCOL_BINDING Protocol; NTSTATUS NtStatus; UINT MinSize; - HANDLE DriverKeyHandle = NULL; - PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; - WCHAR *DataPtr; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -703,172 +845,13 @@ InitializeListHead(&Protocol->AdapterListHead); - /* - * bind the protocol to all of its miniports - * - * open registry path - * get list of devices from Bind key - * call BindAdapterHandler for each - */ - { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RegistryPath; - WCHAR *RegistryPathStr; - - RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); - RegistryPathStr[wcslen(SERVICES_KEY)+ProtocolCharacteristics->Name.Length/sizeof(WCHAR)] = 0; - wcscat(RegistryPathStr, LINKAGE_KEY); - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); - - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); - - ExFreePool(RegistryPathStr); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); - - { - UNICODE_STRING ValueName; - ULONG ResultLength; - - RtlInitUnicodeString(&ValueName, L"Bind"); - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); - if(!KeyInformation) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ZwClose(DriverKeyHandle); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); - - ZwClose(DriverKeyHandle); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - for (DataPtr = (WCHAR *)KeyInformation->Data; - *DataPtr != 0; - DataPtr += wcslen(DataPtr) + 1) - { - /* BindContext is for tracking pending binding operations */ - VOID *BindContext = 0; - NDIS_STRING DeviceName; - NDIS_STRING RegistryPath; - WCHAR *RegistryPathStr = NULL; - ULONG PathLength = 0; - - RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ - - /* - * RegistryPath should be: - * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip - * - * This is constructed as follows: - * SERVICES_KEY + extracted device name + Protocol name from characteristics - */ - - PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ - wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ - sizeof(PARAMETERS_KEY) + /* \Parameters\ */ - ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ - - RegistryPathStr = ExAllocatePool(PagedPool, PathLength); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(Protocol); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcscat(RegistryPathStr, DataPtr + 8 ); - wcscat(RegistryPathStr, PARAMETERS_KEY); - wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); - - RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - - NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", - &DeviceName, &RegistryPath)); - - /* XXX SD must do something with bind context */ + ndisBindMiniportsToProtocol(Status, Protocol, ProtocolCharacteristics); + + if (*Status == NDIS_STATUS_SUCCESS) { + ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); *NdisProtocolHandle = Protocol; - - { - BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; - if(BindHandler) - BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); - else - NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); - } - - /* - (*(Protocol->Chars.BindAdapterHandler))(Status, BindContext, &DeviceName, &RegistryPath, 0); - */ - - if(*Status == NDIS_STATUS_SUCCESS) - { - /* Put protocol binding struct on global list */ - ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); - } - else if(*Status != NDIS_STATUS_PENDING) - { - NDIS_DbgPrint(MIN_TRACE, ("ProtocolBindAdapter failed with status 0x%x\n", *Status)); - ExFreePool(Protocol); - ExFreePool(KeyInformation); - *NdisProtocolHandle = NULL; - return; - } - } - - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_SUCCESS; + } else + ExFreePool(Protocol); } @@ -977,4 +960,17 @@ BytesTransferred); } +/* + * @implemented + */ +VOID +NTAPI +NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) +{ + PPROTOCOL_BINDING Protocol = NdisProtocolHandle; + NDIS_STATUS NdisStatus; + + ndisBindMiniportsToProtocol(&NdisStatus, Protocol, &Protocol->Chars); +} + /* EOF */ Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Nov 13 13:52:11 2008 @@ -1063,13 +1063,3 @@ ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); return NDIS_STATUS_SUCCESS; } - -/* - * @unimplemented - */ -VOID -NTAPI -NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) -{ - UNIMPLEMENTED; -}

1 0

[cgutman] 37341: - Merge r37399 from trunk
by cgutman＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: cgutman Date: Thu Nov 13 12:54:11 2008 New Revision: 37341 URL: http://svn.reactos.org/svn/reactos?rev=37341&view=rev Log: - Merge r37399 from trunk Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis.def branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis.def [iso-8859-1] Thu Nov 13 12:54:11 2008 @@ -233,7 +233,7 @@ NdisReadNetworkAddress@16 NdisReadPciSlotInformation@20 NdisReadPcmciaAttributeMemory@16 -;NdisReEnumerateProtocolBindings ? +NdisReEnumerateProtocolBindings@4 NdisRegisterAdapter@24 NdisRegisterAdapterShutdownHandler@12 NdisRegisterProtocol@16 Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Nov 13 12:54:11 2008 @@ -1064,6 +1064,12 @@ return NDIS_STATUS_SUCCESS; } - - -/* EOF */ +/* + * @unimplemented + */ +VOID +NTAPI +NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) +{ + UNIMPLEMENTED; +}

1 0

[dreimer] 37340: A loooong time ago there was something called Batch. It was a old scripting "language" which you could use for some stuff, but with hacks, so ugly, you would turn to stone if used. Then there was the new shiny Powershell Scripting Language which came from the deep resorts of the Devil GaTeS with great features like a XML parser and more. A great war began for the right to be used in the Glorious Heaven of RosBE. After some salves of XML parse and shrapnels of DeHacking, Batch wa
by dreimer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: dreimer Date: Thu Nov 13 12:11:25 2008 New Revision: 37340 URL: http://svn.reactos.org/svn/reactos?rev=37340&view=rev Log: A loooong time ago there was something called Batch. It was a old scripting "language" which you could use for some stuff, but with hacks, so ugly, you would turn to stone if used. Then there was the new shiny Powershell Scripting Language which came from the deep resorts of the Devil GaTeS with great features like a XML parser and more. A great war began for the right to be used in the Glorious Heaven of RosBE. After some salves of XML parse and shrapnels of DeHacking, Batch was fainted and vanished. The glorious winner of the war helped to gain worldwide peace and food for the hungry ppl. After a loong live Powershell died and was replaced by PS 2.0. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Thu Nov 13 12:11:25 2008 @@ -37,6 +37,7 @@ "Working Configuration File was not found in ReactOS Source Tree." } } + settitle } elseif ($args[0] -eq "update") { "old config.rbuild will be deleted and will be updated with a recent," @@ -49,9 +50,11 @@ copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" "Successfully Updated." } + settitle } elseif ($args[0] -ne $null) { "Unknown parameter specified. Try 'help [COMMAND]'." + settitle } # @@ -89,8 +92,14 @@ "" $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") {del "$ENV:APPDATA\RosBE\*.rbuild" | del ".\config.rbuild" | copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} - } -} + if ($YESNO -eq "no") {settitle} + } +} + +# +# Prepare XML Parser. +# +[xml] $XML = type "$ENV:APPDATA\RosBE\config.rbuild" # # Start with reading settings from config.rbuild and let the user edit them. @@ -98,8 +107,7 @@ "Sub-Architecture to build for." "Default is: none" "" -$SARCH = type "$ENV:APPDATA\RosBE\config.rbuild" | find "SARCH" | find "property name" -"$SARCH = $SARCH:~7,-1" +$SARCH = $xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value} "Right now: $SARCH" $SARCH_CH = Read-Host "(), (xbox)" cls @@ -115,12 +123,11 @@ " VIA: c3, c3-2" " Default is: pentium" "" -$OARCH = type "$ENV:APPDATA\RosBE\config.rbuild" | find "OARCH" | find "property name" -"$OARCH = $OARCH:~7,-1" +$OARCH = $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value} "Right now: $OARCH" $OARCH_CH = Read-Host if ($OARCH_CH -eq $null) { - $OARCH_CH = "pentium" + $OARCH_CH = $OARCH } cls @@ -131,24 +138,22 @@ "official release builds and debug builds." "warning : 2,3,4,5 is not tested on ReactOS. Change at own risk." "" -$OPTIMIZE = type "$ENV:APPDATA\RosBE\config.rbuild" | find "OPTIMIZE" | find "property name" -"$OPTIMIZE = $OPTIMIZE:~7,-1" +$OPTIMIZE = $xml.group.property | ? { $_.Name -eq "OPTIMIZE" } | % { $_.Value} "Right now: $OPTIMIZE" -OPTIMIZE_CH = Read-Host "(0), (1), (2), (3), (4), (5)" +$OPTIMIZE_CH = Read-Host "(0), (1), (2), (3), (4), (5)" if ($OPTIMIZE_CH -eq $null) { - $OPTIMIZE_CH = 1 + $OPTIMIZE_CH = $OPTIMIZE } cls "Whether to compile in the integrated kernel debugger." "Default is: 1" "" -$KDBG = type "$ENV:APPDATA\RosBE\config.rbuild" | find "KDBG" | find "property name" -"$KDBG = $KDBG:~7,-1" +$KDBG = $xml.group.property | ? { $_.Name -eq "KDBG" } | % { $_.Value} "Right now: $KDBG" $KDBG_CH = Read-Host "(0), (1)" if ($KDBG_CH -eq $null) { - $KDBG_CH = 1 + $KDBG_CH = $KDBG } cls @@ -156,12 +161,11 @@ "performed." "Default is: 1" "" -$DBG = type "$ENV:APPDATA\RosBE\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG" -"$DBG = $DBG:~7,-1" +$DBG = $xml.group.property | ? { $_.Name -eq "DBG" } | % { $_.Value} "Right now: $DBG" $DBG_CH = Read-Host "(0), (1)" if ($KDBG_CH -eq $null) { - $DBG_CH = 1 + $DBG_CH = $DBG } cls @@ -169,12 +173,11 @@ "don't enable this." "Default is: 0" "" -$GDB = type "$ENV:APPDATA\RosBE\config.rbuild" | find "GDB" | find "property name" -"$GDB = $GDB:~7,-1" +$GDB = $xml.group.property | ? { $_.Name -eq "GDB" } | % { $_.Value} "Right now: $GDB" $GDB_CH = Read-Host "(0), (1)" if ($GDB_CH -eq $null) { - $GDB_CH = 0 + $GDB_CH = $GDB } cls @@ -184,12 +187,11 @@ "from the patent owner)." "Default is: 0" "" -$NSWPAT = type "$ENV:APPDATA\RosBE\config.rbuild" | find "NSWPAT" | find "property name" -"$NSWPAT = $NSWPAT:~7,-1" +$NSWPAT = $xml.group.property | ? { $_.Name -eq "NSWPAT" } | % { $_.Value} "Right now: $NSWPAT" $NSWPAT_CH = Read-Host "(0), (1)" if ($NSWPAT_CH -eq $null) { - $NSWPAT_CH = 0 + $NSWPAT_CH = $NSWPAT } cls @@ -201,33 +203,26 @@ "unless you know what you're doing." "Default is: 0" "" -$WINKD = type "$ENV:APPDATA\RosBE\config.rbuild" | find "_WINKD_" | find "property name" -"$WINKD = $WINKD:~7,-1" +$WINKD = $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value} "Right now: $WINKD" $WINKD_CH = Read-Host "(0), (1)" if ($WINKD_CH -eq $null) { - $WINKD_CH = 0 + $WINKD_CH = $WINKD } cls # # Generate a config.rbuild, copy it to the Source Tree and delete temp files. # -'<?xml version="1.0"?>' | out-file "$ENV:TEMP\config.tmp" -'<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">' | out-file -append "$ENV:TEMP\config.tmp" -'<group>' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="SARCH" value="' + $SARCH_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="OARCH" value="' + $OARCH_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="OPTIMIZE" value="' + $OPTIMIZE_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="KDBG" value="' + $KDBG_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="DBG" value="' + $DBG_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="GDB" value="' + $GDB_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="NSWPAT" value="' + $NSWPAT_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'<property name="_WINKD_" value="' + $WINKD_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" -'</group^>' | out-file -append "'$ENV:TEMP\config.tmp" - -copy "$ENV:TEMP\config.tmp" "$ENV:APPDATA\RosBE\config.rbuild" -del $ENV:TEMP\config.tmp +$xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value = "$SARCH_CH"} +$xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value = "$OARCH_CH"} +$xml.group.property | ? { $_.Name -eq "OPTIMIZE" } | % { $_.Value = "$OPTIMIZE_CH"} +$xml.group.property | ? { $_.Name -eq "KDBG" } | % { $_.Value = "$KDBG_CH"} +$xml.group.property | ? { $_.Name -eq "DBG" } | % { $_.Value = "$DBG_CH"} +$xml.group.property | ? { $_.Name -eq "GDB" } | % { $_.Value = "$GDB_CH"} +$xml.group.property | ? { $_.Name -eq "NSWPAT" } | % { $_.Value = "$NSWPAT_CH"} +$xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} +$xml.save("$ENV:APPDATA\RosBE\config.rbuild") copy "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" if ($_ROSBE_VERSION -ne $null) { @@ -254,5 +249,6 @@ $GDB = $null $NSWPAT = $null $WINKD = $null +$XML = $null settitle

1 0

[sginsberg] 37339: - stub out NdisReEnumerateProtocolBindings
by sginsberg＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: sginsberg Date: Thu Nov 13 10:06:43 2008 New Revision: 37339 URL: http://svn.reactos.org/svn/reactos?rev=37339&view=rev Log: - stub out NdisReEnumerateProtocolBindings Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Thu Nov 13 10:06:43 2008 @@ -233,7 +233,7 @@ NdisReadNetworkAddress@16 NdisReadPciSlotInformation@20 NdisReadPcmciaAttributeMemory@16 -;NdisReEnumerateProtocolBindings ? +NdisReEnumerateProtocolBindings@4 NdisRegisterAdapter@24 NdisRegisterAdapterShutdownHandler@12 NdisRegisterProtocol@16 Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Nov 13 10:06:43 2008 @@ -1064,6 +1064,12 @@ return NDIS_STATUS_SUCCESS; } - - -/* EOF */ +/* + * @unimplemented + */ +VOID +NTAPI +NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) +{ + UNIMPLEMENTED; +}

1 0

[jimtabor] 37338: - Set the right flags for Background and Text color.
by jimtabor＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: jimtabor Date: Thu Nov 13 09:01:01 2008 New Revision: 37338 URL: http://svn.reactos.org/svn/reactos?rev=37338&view=rev Log: - Set the right flags for Background and Text color. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/text.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] Thu Nov 13 09:01:01 2008 @@ -1064,7 +1064,7 @@ if ( Dc_Attr->crBackgroundClr != crColor ) { - Dc_Attr->ulDirty_ |= DIRTY_LINE; + Dc_Attr->ulDirty_ |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); Dc_Attr->crBackgroundClr = crColor; } return OldColor; Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Nov 13 09:01:01 2008 @@ -617,7 +617,7 @@ if ( Dc_Attr->crForegroundClr != crColor ) { - Dc_Attr->ulDirty_ |= DIRTY_TEXT; + Dc_Attr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); Dc_Attr->crForegroundClr = crColor; } return OldColor;

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