Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34248: Arc, RoundRect: - Converted over to use the new draw/fill square algorithm for draw arcs and draw/fill round rects. - Tested with (Area.exe) Yuan program. Getting better.
by jimtabor＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: jimtabor Date: Wed Jul 2 02:47:23 2008 New Revision: 34248 URL: http://svn.reactos.org/svn/reactos?rev=34248&view=rev Log: Arc, RoundRect: - Converted over to use the new draw/fill square algorithm for draw arcs and draw/fill round rects. - Tested with (Area.exe) Yuan program. Getting better. Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c 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] Wed Jul 2 02:47:23 2008 @@ -26,6 +26,7 @@ #define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) BOOL FASTCALL IntFillArc( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, double StartArc, double EndArc, ARCTYPE arctype); +BOOL FASTCALL IntDrawArc( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, double StartArc, double EndArc, ARCTYPE arctype, PGDIBRUSHOBJ PenBrushObj); static BOOL @@ -147,6 +148,16 @@ arctype); } + ret = IntDrawArc( dc, + RectBounds.left, + RectBounds.top, + abs(RectBounds.right-RectBounds.left), // Width + abs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype, + PenBrushObj); + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); if (NULL == BitmapObj) { @@ -161,63 +172,11 @@ if (arctype == GdiTypePie) { PUTLINE(CenterX, CenterY, SfCx + CenterX, SfCy + CenterY, PenBrushInst); - } - { - double AngS = AngleStart, AngT = AngleEnd, - Factor = fabs(RadiusX) < 25 ? 1.0 : (25/fabs(RadiusX)); - int x,y, ox = 0, oy = 0; - BOOL Start = TRUE; - - if (dc->DcLevel.flPath & DCPATH_CLOCKWISE) - { - DPRINT1("Arc CW\n"); - for (; AngS < AngT; AngS += Factor) - { - x = (RadiusX * Rcos(AngS)); - y = (RadiusY * Rsin(AngS)); - - DPRINT("Arc CW -> %d, X: %d Y: %d\n",(INT)AngS,x,y); - if (Start) - { - PUTPIXEL(x + CenterX, y + CenterY, PenBrushInst); - ox = x; - oy = y; - Start = FALSE; - continue; - } - PUTLINE(ox + CenterX, oy + CenterY, x + CenterX, y + CenterY, PenBrushInst); - ox = x; - oy = y; - } - } - else - { - DPRINT1("Arc CCW\n"); - for (; AngT < AngS; AngS -= Factor) - { - x = (RadiusX * Rcos(AngS)); - y = (RadiusY * Rsin(AngS)); - - DPRINT("Arc CCW -> %d, X: %d Y: %d\n",(INT)AngS,x,y); - if (Start) - { - PUTPIXEL(x + CenterX, y + CenterY, PenBrushInst); - ox = x; - oy = y; - Start = FALSE; - continue; - } - PUTLINE(ox + CenterX, oy + CenterY, x + CenterX, y + CenterY, PenBrushInst); - ox = x; - oy = y; - } - } - } - if (arctype == GdiTypePie) PUTLINE(EfCx + CenterX, EfCy + CenterY, CenterX, CenterY, PenBrushInst); + } if (arctype == GdiTypeChord) - PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, PenBrushInst); - + PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, PenBrushInst); + PenBrushObj->ptPenWidth.x = PenOrigWidth; BITMAPOBJ_UnlockBitmap(BitmapObj); PENOBJ_UnlockPen(PenBrushObj); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Jul 2 02:47:23 2008 @@ -63,6 +63,9 @@ int width, height; /* width and height of rect */ } Rect, *PRect; +int FASTCALL IntFillRect(DC *dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ BrushObj, BOOL Pen); +int FASTCALL app_fill_rect(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj, BOOL Pen); + static POINT INTERNAL_CALL @@ -101,152 +104,8 @@ * is no way for the program to know which portions of the * window are currently obscured. */ -static -int -INTERNAL_CALL -app_fill_rect(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj) -{ - DWORD ROP = PATCOPY; - RECTL DestRect; - BITMAPOBJ *BitmapObj; - GDIBRUSHINST BrushInst; - POINTL BrushOrigin; - BOOL Ret = TRUE; - PDC_ATTR Dc_Attr = NULL; - - ASSERT(BrushObj); - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (BitmapObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - /* fix negative spaces */ - if (r.width < 0) - { - r.x += r.width; - r.width = 0 - r.width; - } - if (r.height < 0) - { - r.y += r.height; - r.height = 0 - r.height; - } - - DestRect.left = r.x; - DestRect.right = r.x + r.width; - - DestRect.top = r.y; - DestRect.bottom = r.y + r.height; - - BrushOrigin.x = BrushObj->ptOrigin.x; - BrushOrigin.y = BrushObj->ptOrigin.y; - - if (Dc_Attr->jROP2 == R2_XORPEN) - ROP = PATINVERT; - else - ROP = PATCOPY; - - IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); - - Ret = IntEngBitBlt( - &BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &BrushInst.BrushObject, // use pDC->eboFill - &BrushOrigin, - ROP3_TO_ROP4(ROP)); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - return (int)Ret; -} - -static -int -INTERNAL_CALL -app_fill_rect_pen(DC *dc, Rect r, PGDIBRUSHOBJ BrushObj) -{ - DWORD ROP = PATCOPY; - RECTL DestRect; - BITMAPOBJ *BitmapObj; - GDIBRUSHINST BrushInst; - POINTL BrushOrigin; - BOOL Ret = TRUE; - PDC_ATTR Dc_Attr = NULL; - - ASSERT(BrushObj); - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (BitmapObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - /* fix negative spaces */ - if (r.width < 0) - { - r.x += r.width; - r.width = 0 - r.width; - } - if (r.height < 0) - { - r.y += r.height; - r.height = 0 - r.height; - } - - DestRect.left = r.x; - DestRect.right = r.x + r.width; - - DestRect.top = r.y; - DestRect.bottom = r.y + r.height; - - BrushOrigin.x = BrushObj->ptOrigin.x; - BrushOrigin.y = BrushObj->ptOrigin.y; - - if (Dc_Attr->jROP2 == R2_XORPEN) - ROP = PATINVERT; - else - ROP = PATCOPY; - - IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlatePen); - - Ret = IntEngBitBlt( - &BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &BrushInst.BrushObject, // use pDC->eboFill - &BrushOrigin, - ROP3_TO_ROP4(ROP)); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - return (int)Ret; -} - +#define app_fill_rect( dc, r, BrushObj, Pen) \ + IntFillRect(dc, r.x, r.y, r.width, r.height, BrushObj, Pen) /* * Drawing an ellipse with a certain line thickness. @@ -306,7 +165,7 @@ // START_DEBUG(); if ((r.width <= 2) || (r.height <= 2)) - return app_fill_rect_pen(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, TRUE); r1.x = r.x + a; r1.y = r.y; @@ -405,8 +264,8 @@ if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W)) { - result &= app_fill_rect_pen(g, r1, BrushObj); - result &= app_fill_rect_pen(g, r2, BrushObj); + result &= app_fill_rect(g, r1, BrushObj, TRUE); + result &= app_fill_rect(g, r2, BrushObj, TRUE); prevx = r1.x; prevy = r1.y; @@ -414,14 +273,14 @@ else if (r1.y+r1.height < r2.y) { /* draw distinct rectangles */ - result &= app_fill_rect_pen(g, rect(r1.x,r1.y, - W,1), BrushObj); - result &= app_fill_rect_pen(g, rect( - r1.x+r1.width-W,r1.y,W,1), BrushObj); - result &= app_fill_rect_pen(g, rect(r2.x, - r2.y,W,1), BrushObj); - result &= app_fill_rect_pen(g, rect( - r2.x+r2.width-W,r2.y,W,1), BrushObj); + result &= app_fill_rect(g, rect(r1.x,r1.y, + W,1), BrushObj, TRUE); + result &= app_fill_rect(g, rect( + r1.x+r1.width-W,r1.y,W,1), BrushObj, TRUE); + result &= app_fill_rect(g, rect(r2.x, + r2.y,W,1), BrushObj, TRUE); + result &= app_fill_rect(g, rect( + r2.x+r2.width-W,r2.y,W,1), BrushObj, TRUE); prevx = r1.x; prevy = r1.y; @@ -450,14 +309,14 @@ W = w; if (W+W >= r.width) { - result &= app_fill_rect_pen(g, rect(r.x, r1.y, - r.width, r1.height), BrushObj); + result &= app_fill_rect(g, rect(r.x, r1.y, + r.width, r1.height), BrushObj, TRUE); return result; } - result &= app_fill_rect_pen(g, rect(r.x, r1.y, W, r1.height), BrushObj); - result &= app_fill_rect_pen(g, rect(r.x+r.width-W, r1.y, - W, r1.height), BrushObj); + result &= app_fill_rect(g, rect(r.x, r1.y, W, r1.height), BrushObj, TRUE); + result &= app_fill_rect(g, rect(r.x+r.width-W, r1.y, + W, r1.height), BrushObj, TRUE); } return result; } @@ -505,7 +364,8 @@ POINT p2, // End int start_angle, int end_angle, - PGDIBRUSHOBJ BrushObj) + PGDIBRUSHOBJ BrushObj, + BOOL Pen) { int x1, x2; int start_above, end_above; @@ -580,36 +440,36 @@ { /* fill outsides of wedge */ if (! app_fill_rect(g, rect(r.x, r.y, - x1-r.x, r.height), BrushObj)) + x1-r.x, r.height), BrushObj, Pen)) return 0; return app_fill_rect(g, rect(x2, r.y, - r.x+r.width-x2, r.height), BrushObj); + r.x+r.width-x2, r.height), BrushObj, Pen); } else { /* fill inside of wedge */ r.width = x1-x2; r.x = x2; - return app_fill_rect(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, Pen); } } else if (start_above) { /* fill to the left of the start_line */ r.width = x1-r.x; - return app_fill_rect(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, Pen); } else if (end_above) { /* fill right of end_line */ r.width = r.x+r.width-x2; r.x = x2; - return app_fill_rect(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, Pen); } else { if (start_angle > end_angle) - return app_fill_rect(g,r, BrushObj); + return app_fill_rect(g,r, BrushObj, Pen); else return 1; } @@ -675,7 +535,7 @@ if (start_above && end_above) { if (start_angle > end_angle) - return app_fill_rect(g,r, BrushObj); + return app_fill_rect(g,r, BrushObj, Pen); else return 1; } @@ -683,14 +543,14 @@ { /* fill to the left of end_line */ r.width = x2-r.x; - return app_fill_rect(g,r, BrushObj); + return app_fill_rect(g,r, BrushObj, Pen); } else if (end_above) { /* fill right of start_line */ r.width = r.x+r.width-x1; r.x = x1; - return app_fill_rect(g,r, BrushObj); + return app_fill_rect(g,r, BrushObj, Pen); } else { @@ -698,17 +558,17 @@ { /* fill outsides of wedge */ if (! app_fill_rect(g, rect(r.x, r.y, - x2-r.x, r.height), BrushObj)) + x2-r.x, r.height), BrushObj, Pen)) return 0; return app_fill_rect(g, rect(x1, r.y, - r.x+r.width-x1, r.height), BrushObj); + r.x+r.width-x1, r.height), BrushObj, Pen); } else { /* fill inside of wedge */ r.width = x2-x1; r.x = x1; - return app_fill_rect(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, Pen); } } } @@ -767,7 +627,7 @@ // START_DEBUG(); if ((r.width <= 2) || (r.height <= 2)) - return app_fill_rect(g, r, BrushObj); + return app_fill_rect(g, r, BrushObj, FALSE); r1.x = r.x + a; r1.y = r.y; @@ -813,8 +673,8 @@ if (r1.y+r1.height < r2.y) { /* distinct rectangles */ - result &= app_fill_rect(g, r1, BrushObj); - result &= app_fill_rect(g, r2, BrushObj); + result &= app_fill_rect(g, r1, BrushObj, FALSE); + result &= app_fill_rect(g, r2, BrushObj, FALSE); } /* move down */ @@ -839,7 +699,7 @@ r1.x = r.x; r1.width = r.width; r1.height = r2.y+r2.height-r1.y; - result &= app_fill_rect(g, r1, BrushObj); + result &= app_fill_rect(g, r1, BrushObj, FALSE); } else if (x <= a) { /* crossover, draw final line */ @@ -847,7 +707,7 @@ r1.width = r.width; r1.height = r1.y+r1.height-r2.y; r1.y = r2.y; - result &= app_fill_rect(g, r1, BrushObj); + result &= app_fill_rect(g, r1, BrushObj, FALSE); } return result; } @@ -1014,10 +874,10 @@ /* distinct rectangles */ result &= app_fill_arc_rect(g, r1, p0, p1, p2, - start_angle, end_angle, BrushObj); + start_angle, end_angle, BrushObj, FALSE); result &= app_fill_arc_rect(g, r2, p0, p1, p2, - start_angle, end_angle, BrushObj); + start_angle, end_angle, BrushObj, FALSE); } /* move down */ @@ -1039,7 +899,7 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r1.x, r1.y, r1.width, 1), - p0, p1, p2, start_angle, end_angle, BrushObj); + p0, p1, p2, start_angle, end_angle, BrushObj, FALSE); r1.y += 1; r1.height -= 1; } @@ -1053,7 +913,7 @@ while (r1.height > 0) { result &= app_fill_arc_rect(g, rect(r1.x, r1.y, r1.width, 1), - p0, p1, p2, start_angle, end_angle, BrushObj); + p0, p1, p2, start_angle, end_angle, BrushObj, FALSE); r1.y += 1; r1.height -= 1; } @@ -1061,7 +921,344 @@ return result; } +int app_draw_arc(DC *g, Rect r, int start_angle, int end_angle, PGDIBRUSHOBJ PenBrushObj, BOOL Chord) +{ + /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */ + + int a = r.width / 2; + int b = r.height / 2; + int x = 0; + int y = b; + long a2 = a*a; + long b2 = b*b; + long xcrit = (3 * a2 / 4) + 1; + long ycrit = (3 * b2 / 4) + 1; + long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */ + long dxt = b2*(3+x+x); + long dyt = a2*(3-y-y); + int d2xt = b2+b2; + int d2yt = a2+a2; + + int w = PenBrushObj->ptPenWidth.x; + + /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */ + + int A = a-w > 0 ? a-w : 0; + int B = b-w > 0 ? b-w : 0; + int X = 0; + int Y = B; + long A2 = A*A; + long B2 = B*B; + long XCRIT = (3 * A2 / 4) + 1; + long YCRIT = (3 * B2 / 4) + 1; + long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */ + long DXT = B2*(3+X+X); + long DYT = A2*(3-Y-Y); + int D2XT = B2+B2; + int D2YT = A2+A2; + + /* arc rectangle calculations */ + int movedown, moveout; + int innerX = 0, prevx, prevy, W; + Rect r1, r2; + int result = 1; + + /* line descriptions */ + POINT p0, p1, p2; + +// START_DEBUG(); + + /* if angles differ by 360 degrees or more, close the shape */ + if ((start_angle + 360 <= end_angle) || + (start_angle - 360 >= end_angle)) + { + return app_draw_ellipse(g, r, PenBrushObj); + } + + /* make start_angle >= 0 and <= 360 */ + while (start_angle < 0) + start_angle += 360; + start_angle %= 360; + + /* make end_angle >= 0 and <= 360 */ + while (end_angle < 0) + end_angle += 360; + end_angle %= 360; + + /* draw nothing if the angles are equal */ + if (start_angle == end_angle) + return 1; + + /* find arc wedge line end points */ + p1 = app_boundary_point(r, start_angle); + p2 = app_boundary_point(r, end_angle); + if (Chord) + p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2); + else + p0 = pt(r.x + r.width/2, r.y + r.height/2); + + /* determine ellipse rectangles */ + r1.x = r.x + a; + r1.y = r.y; + r1.width = r.width & 1; /* i.e. if width is odd */ + r1.height = 1; + + r2 = r1; + r2.y = r.y + r.height - 1; + + prevx = r1.x; + prevy = r1.y; + + while (y > 0) + { + while (Y == y) + { + innerX = X; + + if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */ + { + /* move outwards to encounter edge */ + X += 1; + T += DXT; + DXT += D2XT; + } + else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */ + { + /* drop down one line */ + Y -= 1; + T += DYT; + DYT += D2YT; + } + else { + /* drop diagonally down and out */ + X += 1; + Y -= 1; + T += DXT + DYT; + DXT += D2XT; + DYT += D2YT; + } + } + + movedown = moveout = 0; + + W = x - innerX; + if (r1.x + W < prevx) + W = prevx - r1.x; + if (W < w) + W = w; + + if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */ + { + /* move outwards to encounter edge */ + x += 1; + t += dxt; + dxt += d2xt; + + moveout = 1; + } + else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */ + { + /* drop down one line */ + y -= 1; + t += dyt; + dyt += d2yt; + + movedown = 1; + } + else { + /* drop diagonally down and out */ + x += 1; + y -= 1; + t += dxt + dyt; + dxt += d2xt; + dyt += d2yt; + + movedown = 1; + moveout = 1; + } + + if (movedown) { + if (r1.width == 0) { + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + moveout = 0; + } + + if (r1.x < r.x) + r1.x = r2.x = r.x; + if (r1.width > r.width) + r1.width = r2.width = r.width; + if (r1.y == r2.y-1) { + r1.x = r2.x = r.x; + r1.width = r2.width = r.width; + } + + if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W)) + { + result &= app_fill_arc_rect(g, r1, + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + result &= app_fill_arc_rect(g, r2, + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + + prevx = r1.x; + prevy = r1.y; + } + else if (r1.y+r1.height < r2.y) + { + /* draw distinct rectangles */ + result &= app_fill_arc_rect(g, rect( + r1.x,r1.y,W,1), + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + result &= app_fill_arc_rect(g, rect( + r1.x+r1.width-W,r1.y,W,1), + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + result &= app_fill_arc_rect(g, rect( + r2.x,r2.y,W,1), + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + result &= app_fill_arc_rect(g, rect( + r2.x+r2.width-W,r2.y,W,1), + p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + + prevx = r1.x; + prevy = r1.y; + } + + /* move down */ + r1.y += 1; + r2.y -= 1; + } + + if (moveout) { + /* move outwards */ + r1.x -= 1; r1.width += 2; + r2.x -= 1; r2.width += 2; + } + } + if ((x <= a) && (prevy < r2.y)) { + /* draw final lines */ + r1.height = r1.y+r1.height-r2.y; + r1.y = r2.y; + + W = w; + if (r.x + W != prevx) + W = prevx - r.x; + if (W < w) + W = w; + + if (W+W >= r.width) { + while (r1.height > 0) { + result &= app_fill_arc_rect(g, rect(r.x, + r1.y, r.width, 1), p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + r1.y += 1; + r1.height -= 1; + } + return result; + } + + while (r1.height > 0) { + result &= app_fill_arc_rect(g, rect(r.x, r1.y, + W, 1), p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + result &= app_fill_arc_rect(g, rect(r.x+r.width-W, + r1.y, W, 1), p0, p1, p2, + start_angle, end_angle, PenBrushObj, TRUE); + r1.y += 1; + r1.height -= 1; + } + } + + return result; +} + /* ReactOS Interface *********************************************************/ + +int +FASTCALL +IntFillRect( DC *dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + PGDIBRUSHOBJ BrushObj, + BOOL Pen) +{ + DWORD ROP = PATCOPY; + RECTL DestRect; + BITMAPOBJ *BitmapObj; + GDIBRUSHINST BrushInst; + POINTL BrushOrigin; + BOOL Ret = TRUE; + PDC_ATTR Dc_Attr = NULL; + + ASSERT(BrushObj); + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (BitmapObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + /* fix negative spaces */ + if (Width < 0) + { + XLeft += Width; + Width = 0 - Width; + } + if (Height < 0) + { + YLeft += Height; + Height = 0 - Height; + } + + DestRect.left = XLeft; + DestRect.right = XLeft + Width; + + DestRect.top = YLeft; + DestRect.bottom = YLeft + Height; + + BrushOrigin.x = BrushObj->ptOrigin.x; + BrushOrigin.y = BrushObj->ptOrigin.y; + + if (Dc_Attr->jROP2 == R2_XORPEN) + ROP = PATINVERT; + else + ROP = PATCOPY; + + if (Pen) + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlatePen); + else + IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); + + Ret = IntEngBitBlt( + &BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &BrushInst.BrushObject, // use pDC->eboFill + &BrushOrigin, + ROP3_TO_ROP4(ROP)); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + return (int)Ret; +} BOOL FASTCALL @@ -1102,6 +1299,28 @@ BOOL FASTCALL +IntDrawArc( PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + double StartArc, + double EndArc, + ARCTYPE arctype, + PGDIBRUSHOBJ PenBrushObj) +{ + int Start = ceill(StartArc); + int End = ceill(EndArc); + BOOL Chord = (arctype == GdiTypeChord); + // Sort out alignment here. + return app_draw_arc(dc, rect( XLeft, YLeft, Width, Height), + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, + (dc->DcLevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, + PenBrushObj, Chord); +} + +BOOL +FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, @@ -1139,3 +1358,154 @@ BRUSHOBJ_UnlockBrush(FillBrushObj); return ret; } + +BOOL +FASTCALL +IntFillRoundRect( PDC dc, + INT Left, + INT Top, + INT Right, + INT Bottom, + INT Wellipse, + INT Hellipse) +{ + PDC_ATTR Dc_Attr; + PGDIBRUSHOBJ FillBrushObj; + Rect r; + int rx, ry; /* radius in x and y directions */ + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (NULL == FillBrushObj) + { + DPRINT1("FillEllipse Fail\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + // x y Width Height + r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top)); + rx = Wellipse/2; + ry = Hellipse/2; + + if (Wellipse > r.width) + { + if (Hellipse > r.height) // > W > H + ret = app_fill_ellipse(dc, r, FillBrushObj); + else // > W < H + { + + app_fill_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse), + 0, 180, FillBrushObj,FALSE); + app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, r.width - 1, Hellipse), + 180, 360, FillBrushObj, FALSE); + } + } + else if(Hellipse > r.height) // < W > H + { + app_fill_arc(dc, rect(r.x, r.y, Wellipse, r.height - 1), + 90, 270, FillBrushObj, FALSE); + app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, r.height - 1), + 270, 90, FillBrushObj,FALSE); + } + else // < W < H + { + app_fill_arc(dc, rect(r.x, r.y, Wellipse, Hellipse), + 90, 180, FillBrushObj, FALSE); + + app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, Wellipse, Hellipse), + 180, 270, FillBrushObj, FALSE); + + app_fill_arc(dc, rect(Right - Wellipse - 1, Bottom - Hellipse - 1, Wellipse, Hellipse), + 270, 360, FillBrushObj,FALSE); + + app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, Hellipse ), + 0, 90, FillBrushObj,FALSE); + } + if (Wellipse < r.width) + { + app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, ry+1), FillBrushObj, FALSE); + app_fill_rect(dc, rect(r.x+rx, r.y+r.height-ry+1, r.width-rx-rx, ry-1), FillBrushObj, FALSE); + } + if (Hellipse < r.height) + { + app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), FillBrushObj, FALSE); + } + + BRUSHOBJ_UnlockBrush(FillBrushObj); + return TRUE; +} + + +BOOL +FASTCALL +IntDrawRoundRect( PDC dc, + INT Left, + INT Top, + INT Right, + INT Bottom, + INT Wellipse, + INT Hellipse, + PGDIBRUSHOBJ PenBrushObj) +{ + Rect r; + int rx, ry; /* radius in x and y directions */ + int w = PenBrushObj->ptPenWidth.x; + + r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top)); + rx = Wellipse/2; + ry = Hellipse/2; + + if (Wellipse > r.width) + { + if (Hellipse > r.height) // > W > H + app_draw_ellipse(dc, r, PenBrushObj); + else // > W < H + { + + app_draw_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse - 1), + 0, 180, PenBrushObj, FALSE); + app_draw_arc(dc, rect(r.x, Bottom - Hellipse, r.width - 1, Hellipse - 1), + 180, 360, PenBrushObj, FALSE); + } + } + else if(Hellipse > r.height) // < W > H + { + app_draw_arc(dc, rect(r.x, r.y, Wellipse - 1, r.height - 1), + 90, 270, PenBrushObj, FALSE); + app_draw_arc(dc, rect(Right - Wellipse, r.y, Wellipse - 1, r.height - 1), + 270, 90, PenBrushObj, FALSE); + } + else // < W < H + { + app_draw_arc(dc, rect(r.x, r.y, Wellipse-1, Hellipse - 1), + 90, 180, PenBrushObj, FALSE); + + app_draw_arc(dc, rect(r.x, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + 180, 270, PenBrushObj, FALSE); + + app_draw_arc(dc, rect(Right - Wellipse, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + 270, 360, PenBrushObj, FALSE); + + app_draw_arc(dc, rect(Right - Wellipse, r.y, Wellipse - 1, Hellipse - 1 ), + 0, 90, PenBrushObj, FALSE); + } + if ( Hellipse < r.height) + { + app_fill_rect(dc, rect(r.x, r.y+ry+1, w, r.height-ry-ry), PenBrushObj, TRUE); + + + app_fill_rect(dc, rect(r.x+r.width-w, r.y+ry+1, w, r.height-ry-ry), + PenBrushObj, TRUE); + } + if ( Wellipse < r.width) + { + app_fill_rect(dc, rect(r.x+rx, r.y+r.height-w, r.width-rx-rx, w), + PenBrushObj, TRUE); + + app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, w), PenBrushObj, TRUE); + } + return TRUE; +} + 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] Wed Jul 2 02:47:23 2008 @@ -46,6 +46,8 @@ BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height); BOOL FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ PenBrushObj); +BOOL FASTCALL IntFillRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse); +BOOL FASTCALL IntDrawRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ PenBrushObj); BOOL FASTCALL IntGdiPolygon(PDC dc, @@ -550,7 +552,7 @@ DestRect.left = LeftRect; DestRect.right = RightRect; - DestRect.top = TopRect; + DestRect.top = TopRect; DestRect.bottom = BottomRect; FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); @@ -669,271 +671,97 @@ FASTCALL IntRoundRect( PDC dc, - int left, - int top, - int right, - int bottom, + int Left, + int Top, + int Right, + int Bottom, int xCurveDiameter, int yCurveDiameter) { PDC_ATTR Dc_Attr; - BITMAPOBJ *BitmapObj; - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; - GDIBRUSHINST FillBrushInst, PenBrushInst; - RECTL RectBounds; - int potential_steps; - int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2; - int xradius, yradius; - //float aspect_square; - long a_square, b_square, - two_a_square, two_b_square, - four_a_square, four_b_square, - d, dinc, ddec; - BOOL first, - ret = TRUE; // default to success + PGDIBRUSHOBJ PenBrushObj; + RECTL RectBounds; + LONG PenWidth, PenOrigWidth; + BOOL ret = TRUE; // default to success ASSERT ( dc ); // caller's responsibility to set this up if ( PATH_IsPathOpen(dc->DcLevel) ) - return PATH_RoundRect ( dc, left, top, right, bottom, + return PATH_RoundRect ( dc, Left, Top, Right, Bottom, xCurveDiameter, yCurveDiameter ); + + if ((Left == Right) || (Top == Bottom)) return TRUE; + + xCurveDiameter = max(abs( xCurveDiameter ), 1); + yCurveDiameter = max(abs( yCurveDiameter ), 1); + + if (Right < Left) + { + INT tmp = Right; Right = Left; Left = tmp; + } + if (Bottom < Top) + { + INT tmp = Bottom; Bottom = Top; Top = tmp; + } + Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - xradius = xCurveDiameter >> 1; - yradius = yCurveDiameter >> 1; - - left += dc->ptlDCOrig.x; - right += dc->ptlDCOrig.x; - top += dc->ptlDCOrig.y; - bottom += dc->ptlDCOrig.y; - - RectBounds.left = left; - RectBounds.right = right; - RectBounds.top = top; - RectBounds.bottom = bottom; - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (!BitmapObj) + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (!PenBrushObj) { /* Nothing to do, as we don't have a bitmap */ SetLastWin32Error(ERROR_INTERNAL_ERROR); return FALSE; } - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (FillBrushObj) - { - if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) - { - /* make null brush check simpler... */ - BRUSHOBJ_UnlockBrush(FillBrushObj); - FillBrushObj = NULL; - } - else - { - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - } - } - - PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); - if (PenBrushObj) - { - if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) - { - /* make null pen check simpler... */ - PENOBJ_UnlockPen(PenBrushObj); - PenBrushObj = NULL; - } - else - { - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - } - } - - right--; - bottom--; - - width = right - left; - height = bottom - top; - - if ( (xradius<<1) > width ) - xradius = width >> 1; - if ( (yradius<<1) > height ) - yradius = height >> 1; - - b_square = yradius * yradius; - a_square = xradius * xradius; - row = yradius; - col = 0; - two_a_square = a_square << 1; - four_a_square = a_square << 2; - four_b_square = b_square << 2; - two_b_square = b_square << 1; - d = two_a_square * ((row - 1) * (row)) - + a_square - + two_b_square * (1 - a_square); - - x1 = left+xradius; - x2 = right-xradius; - y1 = top; - y2 = bottom; - - x1start = x1; - x2start = x2; - - dinc = two_b_square*3; /* two_b_square * (3 + (col << 1)); */ - ddec = four_a_square * row; - - first = TRUE; - for ( ;; ) - { - if ( d >= 0 ) - { - if ( FillBrushObj ) - PUTLINE ( x1, y1, x2, y1, FillBrushInst ); - if ( first ) - { - if ( PenBrushObj ) - { - if ( x1start > x1 ) - { - PUTLINE ( x1, y1, x1start, y1, PenBrushInst ); - PUTLINE ( x2start+1, y2, x2+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y1, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - } - } - first = FALSE; - } - else - { - if ( FillBrushObj ) - PUTLINE ( x1, y2, x2, y2, FillBrushInst ); - if ( PenBrushObj ) - { - if ( x1start >= x1 ) - { - PUTLINE ( x1, y1, x1start+1, y1, PenBrushInst ); - PUTLINE ( x2start, y2, x2+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y1, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - } - } - } - if ( PenBrushObj ) - { - if ( x1start > x1 ) - { - PUTLINE ( x1, y2, x1start+1, y2, PenBrushInst ); - PUTLINE ( x2start, y1, x2+1, y1, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y2, PenBrushInst ); - PUTPIXEL ( x2, y1, PenBrushInst ); - } - } - x1start = x1-1; - x2start = x2+1; - row--, y1++, y2--, ddec -= four_a_square; - d -= ddec; - } - - potential_steps = ( a_square * row ) / b_square - col + 1; - while ( d < 0 && potential_steps-- ) - { - d += dinc; /* two_b_square * (3 + (col << 1)); */ - col++, x1--, x2++, dinc += four_b_square; - } - - if ( a_square * row <= b_square * col ) - break; - }; - - d = two_b_square * (col + 1) * col - + two_a_square * (row * (row - 2) + 1) - + (1 - two_a_square) * b_square; - dinc = ddec; /* four_b_square * col; */ - ddec = two_a_square * ((row << 1) - 3); - - while ( row ) - { - if ( FillBrushObj ) - { - PUTLINE ( x1, y1, x2, y1, FillBrushInst ); - PUTLINE ( x1, y2, x2, y2, FillBrushInst ); - } - if ( PenBrushObj ) - { - PUTPIXEL ( x2, y1, PenBrushInst ); - PUTPIXEL ( x1, y2, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - PUTPIXEL ( x1, y1, PenBrushInst ); - } - - if ( d <= 0 ) - { - col++, x1--, x2++, dinc += four_b_square; - d += dinc; //four_b_square * col; - } - - row--, y1++, y2--, ddec -= four_a_square; - d -= ddec; //two_a_square * ((row << 1) - 3); - } - - if ( FillBrushObj ) - { - PUTLINE ( left, y1, right, y1, FillBrushInst ); - PUTLINE ( left, y2, right, y2, FillBrushInst ); - } - if ( PenBrushObj ) - { - if ( x1 > (left+1) ) - { - PUTLINE ( left, y1, x1, y1, PenBrushInst ); - PUTLINE ( x2+1, y1, right, y1, PenBrushInst ); - PUTLINE ( left+1, y2, x1, y2, PenBrushInst ); - PUTLINE ( x2+1, y2, right+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( left, y1, PenBrushInst ); - PUTPIXEL ( right, y2, PenBrushInst ); - } - } - - x1 = left+xradius; - x2 = right-xradius; - y1 = top+yradius; - y2 = bottom-yradius; - - if ( FillBrushObj ) - { - for ( i = y1+1; i < y2; i++ ) - PUTLINE ( left, i, right, i, FillBrushInst ); - } - - if ( PenBrushObj ) - { - PUTLINE ( x1, top, x2, top, PenBrushInst ); - PUTLINE ( right, y1, right, y2, PenBrushInst ); - PUTLINE ( x2, bottom, x1, bottom, PenBrushInst ); - PUTLINE ( left, y2, left, y1, PenBrushInst ); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - if (PenBrushObj != NULL) - PENOBJ_UnlockPen(PenBrushObj); - if (FillBrushObj != NULL) - BRUSHOBJ_UnlockBrush(FillBrushObj); - + PenOrigWidth = PenWidth = PenBrushObj->ptPenWidth.x; + if (PenBrushObj->ulPenStyle == PS_NULL) PenWidth = 0; + + if (PenBrushObj->ulPenStyle == PS_INSIDEFRAME) + { + if (2*PenWidth > (Right - Left)) PenWidth = (Right -Left + 1)/2; + if (2*PenWidth > (Bottom - Top)) PenWidth = (Bottom -Top + 1)/2; + Left += PenWidth / 2; + Right -= (PenWidth - 1) / 2; + Top += PenWidth / 2; + Bottom -= (PenWidth - 1) / 2; + } + + if (!PenWidth) PenWidth = 1; + PenBrushObj->ptPenWidth.x = PenWidth; + + RectBounds.left = Left; + RectBounds.top = Top; + RectBounds.right = Right; + RectBounds.bottom = Bottom; + + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + + RectBounds.left += dc->ptlDCOrig.x; + RectBounds.top += dc->ptlDCOrig.y; + RectBounds.right += dc->ptlDCOrig.x; + RectBounds.bottom += dc->ptlDCOrig.y; + + ret = IntFillRoundRect( dc, + RectBounds.left, + RectBounds.top, + RectBounds.right, + RectBounds.bottom, + xCurveDiameter, + yCurveDiameter); + if (ret) + ret = IntDrawRoundRect( dc, + RectBounds.left, + RectBounds.top, + RectBounds.right, + RectBounds.bottom, + xCurveDiameter, + yCurveDiameter, + PenBrushObj); + + PenBrushObj->ptPenWidth.x = PenOrigWidth; + PENOBJ_UnlockPen(PenBrushObj); return ret; }

1 0

[mkupfer] 34247: - minor fixes for translation strings applied. - README for i18n issue added
by mkupfer＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: mkupfer Date: Wed Jul 2 02:34:37 2008 New Revision: 34247 URL: http://svn.reactos.org/svn/reactos?rev=34247&view=rev Log: - minor fixes for translation strings applied. - README for i18n issue added Added: branches/matthias-i18n/media/inf/README (with props) Modified: branches/matthias-i18n/boot/bootdata/de_DE.inf branches/matthias-i18n/media/inf/NET_NIC.inf branches/matthias-i18n/media/inf/display.inf branches/matthias-i18n/media/inf/msmouse.inf Modified: branches/matthias-i18n/boot/bootdata/de_DE.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/boot/bootdata/de_… ============================================================================== --- branches/matthias-i18n/boot/bootdata/de_DE.inf [iso-8859-1] (original) +++ branches/matthias-i18n/boot/bootdata/de_DE.inf [iso-8859-1] Wed Jul 2 02:34:37 2008 @@ -5,7 +5,7 @@ ; Country Codes -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","Name",0x00000000,"Vereinigte Staten von Amerika" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","Name",0x00000000,"Vereinigte Staaten von Amerika" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","Name",0x00000000,"Britische Jungferninseln" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","Name",0x00000000,"Kanada" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","Name",0x00000000,"Dominica" Modified: branches/matthias-i18n/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/NET_NIC… ============================================================================== --- branches/matthias-i18n/media/inf/NET_NIC.inf [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/NET_NIC.inf [iso-8859-1] Wed Jul 2 02:34:37 2008 @@ -29,5 +29,5 @@ - + Added: branches/matthias-i18n/media/inf/README URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/README?… ============================================================================== --- branches/matthias-i18n/media/inf/README (added) +++ branches/matthias-i18n/media/inf/README [iso-8859-1] Wed Jul 2 02:34:37 2008 @@ -1,0 +1,53 @@ +Internationalization of INF-files: + +For internationalization of INF-files each [Strings]-section need a language +sepcific additional one. This section have the name [Strings.LanguageId] e.g. +[Strings.0407] for German. During setup dependent on the system language the +language dependent substitations will be applied and the result will be +stored in the registry. That's the way Microsoft described in MSDN: +http://msdn.microsoft.com/en-us/library/ms794543.aspx +The result is, that we have a system language, where all strings are +translated in best case. A fictional example: + +[a_inf_section] + +an_arbitrary_key = %value_1% + +[Strings] + +value_1 = "english version value_1" + +[Strings.0407] + +value_1 = "deutsche version value_1" + +All of the INF-files containting translated strings have to be encoded in +16 bit unicode (UTF-16) with byte order mark. +Remember, during installation we make one translated version and store that to +registry, all other versions provided in INF-file will discard. Due to this +fact, there is (at least) one question left: How to realize multiple system +languages simultanously in a Microsoft compatible manner? A suggestion is to +store all translations in registry. Let's assume we have a key (like in example +above) in registry: + +an_arbitrary_key = "english version value_1" + +Whether it's a translated or the english default one. For each other language +that comes with INF-file we create a new key in the Strings.LanguageID manner: + +an_arbitrary_key.0407 = "deutsche version value_1" + +In the hope Windows will ignore that additional keys, we can use it to handle +multiple languages at the same time with a default language as well not limited +to english. Additional to Windows we have to implement/modify the +registry-related functions to consider the language specific keys, but that's +a little effort and i think it doesn't lead into incompatibility. +To prevent a bloated registry we could modify that way and add the translated +strings to registry only if a user select new (still uninstalled) language. + +General issues of multiple (system) languages: + +We can translate the programm files and perhaps the registry entries in the +described above. But how to handle files/directories with translatabel names? +If we intend to have a (native) language for each user, so the directory +structure may become confusing and hard to handle correctly. Propchange: branches/matthias-i18n/media/inf/README ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/matthias-i18n/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/display… ============================================================================== --- branches/matthias-i18n/media/inf/display.inf [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/display.inf [iso-8859-1] Wed Jul 2 02:34:37 2008 @@ -73,8 +73,8 @@ - + - + Modified: branches/matthias-i18n/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/msmouse… ============================================================================== --- branches/matthias-i18n/media/inf/msmouse.inf [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/msmouse.inf [iso-8859-1] Wed Jul 2 02:34:37 2008 @@ -146,17 +146,17 @@ - + - + - + - +

1 0

[pschweitzer] 34246: Added myself to CREDITS No comments :p
by pschweitzer＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: pschweitzer Date: Wed Jul 2 02:06:27 2008 New Revision: 34246 URL: http://svn.reactos.org/svn/reactos?rev=34246&view=rev Log: Added myself to CREDITS No comments :p Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=34246&r1=34245… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Wed Jul 2 02:06:27 2008 @@ -53,6 +53,7 @@ Pablo Borobia <pborobia(a)gmail.com> Paolo Pantaleo <paolopan(a)freemail.it> Peter Ward <dralnix(a)gmail.com> +Pierre Schweitzer <pschweitzer(a)reactos.org> Phillip Susi <phreak(a)iag.net> Rex Jolliff <rex(a)lvcablemodem.com> Richard Campbell <betam4x(a)gmail.com>

1 0

[silverblade] 34245: Splitting of audio support libraries, to avoid including un-needed code when building actual audio drivers (eg, only NT4 requires named audio device files). This allows sbdsp to be split into relevant source files rather than being a single file.
by silverblade＠svn.reactos.org 02 Jul '08

02 Jul '08

Author: silverblade Date: Tue Jul 1 21:16:51 2008 New Revision: 34245 URL: http://svn.reactos.org/svn/reactos?rev=34245&view=rev Log: Splitting of audio support libraries, to avoid including un-needed code when building actual audio drivers (eg, only NT4 requires named audio device files). This allows sbdsp to be split into relevant source files rather than being a single file. Added: branches/silverblade-audio/lib/drivers/sound/legacy/ branches/silverblade-audio/lib/drivers/sound/legacy/devname.c - copied unchanged from r34242, branches/silverblade-audio/lib/drivers/sound/devname.c branches/silverblade-audio/lib/drivers/sound/legacy/hardware.c - copied unchanged from r34242, branches/silverblade-audio/lib/drivers/sound/hardware.c branches/silverblade-audio/lib/drivers/sound/legacy/legacy.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/shared/ branches/silverblade-audio/lib/drivers/sound/shared/shared.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/shared/time.c - copied unchanged from r34242, branches/silverblade-audio/lib/drivers/sound/time.c branches/silverblade-audio/lib/drivers/sound/soundblaster/ branches/silverblade-audio/lib/drivers/sound/soundblaster/dsp_io.c (with props) branches/silverblade-audio/lib/drivers/sound/soundblaster/mixer.c (with props) branches/silverblade-audio/lib/drivers/sound/soundblaster/rate.c (with props) branches/silverblade-audio/lib/drivers/sound/soundblaster/soundblaster.rbuild (with props) branches/silverblade-audio/lib/drivers/sound/soundblaster/speaker.c (with props) branches/silverblade-audio/lib/drivers/sound/soundblaster/version.c (with props) branches/silverblade-audio/lib/drivers/sound/uartmidi/ branches/silverblade-audio/lib/drivers/sound/uartmidi/midiuart.c - copied unchanged from r34242, branches/silverblade-audio/lib/drivers/sound/midiuart.c branches/silverblade-audio/lib/drivers/sound/uartmidi/uartmidi.rbuild (with props) Removed: branches/silverblade-audio/lib/drivers/sound/devname.c branches/silverblade-audio/lib/drivers/sound/hardware.c branches/silverblade-audio/lib/drivers/sound/midiuart.c branches/silverblade-audio/lib/drivers/sound/sbdsp.c branches/silverblade-audio/lib/drivers/sound/time.c Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h branches/silverblade-audio/lib/drivers/sound/sound.rbuild Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -6,7 +6,8 @@ <include base="sb16_nt4">..</include> <include base="ReactOS">include/reactos/libs/sound</include> <importlibrary definition="sb16_nt4.def" /> - <library>sound</library> + <library>soundblaster</library> + <library>audio</library> <library>ntoskrnl</library> <library>hal</library> <file>main.c</file> Modified: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -77,6 +77,44 @@ #define SB_DSP_SPEAKER_STATUS 0xD8 #define SB_DSP_VERSION 0xE1 +/* + Mixer lines (legacy) +*/ +#define SB_MIX_VOC_LEVEL 0x04 +#define SB_MIX_LEGACY_MIC_LEVEL 0x0A +#define SB_MIX_MASTER_LEVEL 0x22 +#define SB_MIX_FM_LEVEL 0x26 +#define SB_MIX_CD_LEVEL 0x28 +#define SB_MIX_LINE_LEVEL 0x2E + +/* + Mixer lines +*/ +#define SB_MIX_MASTER_LEFT_LEVEL 0x30 +#define SB_MIX_MASTER_RIGHT_LEVEL 0x31 +#define SB_MIX_VOC_LEFT_LEVEL 0x32 +#define SB_MIX_VOC_RIGHT_LEVEL 0x33 +#define SB_MIX_MIDI_LEFT_LEVEL 0x34 +#define SB_MIX_MIDI_RIGHT_LEVEL 0x35 +#define SB_MIX_CD_LEFT_LEVEL 0x36 +#define SB_MIX_CD_RIGHT_LEVEL 0x37 +#define SB_MIX_LINE_LEFT_LEVEL 0x38 +#define SB_MIX_LINE_RIGHT_LEVEL 0x39 +#define SB_MIX_MIC_LEVEL 0x3A +#define SB_MIX_PC_SPEAKER_LEVEL 0x3B +#define SB_MIX_OUTPUT_SWITCHES 0x3C +#define SB_MIX_INPUT_LEFT_LEVEL 0x3D +#define SB_MIX_INPUT_RIGHT_LEVEL 0x3E +#define SB_MIX_INPUT_LEFT_GAIN 0x3F +#define SB_MIX_INPUT_RIGHT_GAIN 0x40 +#define SB_MIX_OUTPUT_LEFT_GAIN 0x41 +#define SB_MIX_OUTPUT_RIGHT_GAIN 0x42 +#define SB_MIX_AGC 0x43 +#define SB_MIX_TREBLE_LEFT_LEVEL 0x44 +#define SB_MIX_TREBLE_RIGHT_LEVEL 0x45 +#define SB_MIX_BASS_LEFT_LEVEL 0x46 +#define SB_MIX_BASS_RIGHT_LEVEL 0x47 + /* Reset the Sound Blaster DSP. Removed: branches/silverblade-audio/lib/drivers/sound/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/devname.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/devname.c (removed) @@ -1,385 +1,0 @@ -/* - ReactOS Sound System - Device naming & creation helper routines - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 25 May 2008 - Created -*/ - -#include <ntddk.h> -#include <ntddsnd.h> -#include <debug.h> - - -/* - Default device names - - Just to keep things tidy, we define a structure to hold both the \\Device - and \\DosDevices names, and then fill this structure with the default - device names that can be found in NTDDSND.H -*/ - -typedef struct _DEVICE_NAME_GROUP -{ - PCWSTR DeviceName; - PCWSTR DosDeviceName; -} DEVICE_NAME_GROUP; - -DEVICE_NAME_GROUP SoundDeviceNameBodies[6] = -{ - { - DD_WAVE_IN_DEVICE_NAME_U, - DD_WAVE_IN_DOS_DEVICE_NAME_U - }, - { - DD_WAVE_OUT_DEVICE_NAME_U, - DD_WAVE_OUT_DOS_DEVICE_NAME_U - }, - { - DD_MIDI_IN_DEVICE_NAME_U, - DD_MIDI_IN_DOS_DEVICE_NAME_U - }, - { - DD_MIDI_OUT_DEVICE_NAME_U, - DD_MIDI_OUT_DOS_DEVICE_NAME_U - }, - { - DD_MIX_DEVICE_NAME_U, - DD_MIX_DOS_DEVICE_NAME_U - }, - { - DD_AUX_DEVICE_NAME_U, - DD_AUX_DOS_DEVICE_NAME_U - } -}; - - -/* - ConstructDeviceName - - This takes a wide-character string containing the device name body (for - example, "\\Device\\WaveOut") and appends the device index, forming a - string like "\\Device\\WaveOut0", and so on. - - The resulting device name is a unicode string. -*/ - -NTSTATUS -ConstructDeviceName( - IN PCWSTR Path, - IN UCHAR Index, - OUT PUNICODE_STRING DeviceName) -{ - UNICODE_STRING UnicodePath; - UNICODE_STRING UnicodeIndex; - WCHAR IndexStringBuffer[5]; - USHORT Size; - USHORT LastCharacterIndex; - - /* Check for NULL parameters */ - if ( ( ! Path ) || ( ! DeviceName ) ) - { - DPRINT("Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - DPRINT("Device index %d out of range", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Initialise the unicode path string */ - RtlInitUnicodeString(&UnicodePath, Path); - - /* Calculate the length to hold the full string */ - Size = UnicodePath.Length + - sizeof(IndexStringBuffer) + - sizeof(UNICODE_NULL); - - /* Allocate memory for DeviceName */ - DeviceName->Buffer = ExAllocatePool(PagedPool, Size); - DeviceName->MaximumLength = Size; - - if ( ! DeviceName->Buffer ) - { - DPRINT("Couldn't allocate memory for device name string"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Copy the path */ - RtlCopyUnicodeString(DeviceName, &UnicodePath); - - /* Convert Index to string and append */ - UnicodeIndex.Buffer = IndexStringBuffer; - UnicodeIndex.MaximumLength = sizeof(IndexStringBuffer); - - RtlIntegerToUnicodeString((ULONG)Index, 10, &UnicodeIndex); - RtlAppendUnicodeStringToString(DeviceName, &UnicodeIndex); - - /* Terminate the string */ - LastCharacterIndex = DeviceName->Length / sizeof(UNICODE_NULL); - DeviceName->Buffer[LastCharacterIndex] = UNICODE_NULL; - - return STATUS_SUCCESS; -} - - -/* - FreeUnicodeStringBuffer - - A small helper routine to free a unicode string buffer, nullify the - buffer and reset the lengths to zero. -*/ - -VOID -FreeUnicodeStringBuffer(IN PUNICODE_STRING String) -{ - ASSERT(String != NULL); - ASSERT(String->Buffer != NULL); - - ExFreePool(String->Buffer); - - String->Buffer = NULL; - String->Length = 0; - String->MaximumLength = 0; -} - - -/* - GetDefaultSoundDeviceNameBodies - - Simply accesses the SoundDeviceNameBodies struct defined earlier and - fills the DeviceNameBody and DosDeviceNameBody parameters accordingly. - - Basically a "safe" way to access the array and perform two assignments - with one call, as this will assign the name and DOS name if a valid - DeviceType is passed, otherwise it will fail with STATUS_INVALID_PARAMETER. -*/ - -NTSTATUS -GetDefaultSoundDeviceNameBodies( - IN UCHAR DeviceType, - OUT PCWSTR* DeviceNameBody, - OUT PCWSTR* DosDeviceNameBody) -{ - ASSERT(DeviceNameBody != NULL); - ASSERT(DosDeviceNameBody != NULL); - - if ( DeviceType > MAX_DEVICE_TYPE ) - { - DPRINT("Invalid device type"); - return STATUS_INVALID_PARAMETER; - } - - *DeviceNameBody = SoundDeviceNameBodies[DeviceType].DeviceName; - *DosDeviceNameBody = SoundDeviceNameBodies[DeviceType].DosDeviceName; - - return STATUS_SUCCESS; -} - - -/* - ConstructSoundDeviceNames - - Given two wide-character strings and a device index, convert these into - two unicode strings with the index appended to the end. - - This is intended for converting a device name and a DOS device name at - the same time. -*/ - -NTSTATUS -ConstructSoundDeviceNames( - IN PCWSTR DeviceNameBody, - IN PCWSTR DosDeviceNameBody, - IN UCHAR Index, - OUT PUNICODE_STRING FullDeviceName, - OUT PUNICODE_STRING FullDosDeviceName) -{ - NTSTATUS Status; - - /* Check for NULL parameters */ - if ( ( ! DeviceNameBody ) || ( ! DosDeviceNameBody ) || - ( ! FullDeviceName ) || ( ! FullDosDeviceName ) ) - { - DPRINT("Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - DPRINT("Device %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - Status = ConstructDeviceName(DeviceNameBody, Index, FullDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* No need to clean up on failure here */ - return Status; - } - - Status = ConstructDeviceName(DosDeviceNameBody, Index, FullDosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* We need to free the string we successfully got earlier */ - FreeUnicodeStringBuffer(FullDeviceName); - return Status; - } - - return STATUS_SUCCESS; -} - - -/* - CreateSoundDevice - - Creates a device and symbolically-links a DOS device to this. Use this - when you want to specify alternative device names to the defaults - (eg: "\\Device\\MySoundDev" rather than "\\Device\\WaveOut") -*/ - -NTSTATUS -CreateSoundDevice( - IN PDRIVER_OBJECT DriverObject, - IN PCWSTR WideDeviceName, - IN PCWSTR WideDosDeviceName, - IN UCHAR Index, - IN ULONG ExtensionSize, - OUT PDEVICE_OBJECT DeviceObject) -{ - NTSTATUS Status; - - UNICODE_STRING DeviceName; - UNICODE_STRING DosDeviceName; - - /* Check for NULL parameters */ - if ( ( ! DriverObject ) || ( ! DeviceObject ) || - ( ! WideDeviceName ) || ( ! WideDosDeviceName ) ) - { - DPRINT("Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - DPRINT("Device index %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Construct the device and DOS device names */ - Status = ConstructSoundDeviceNames(WideDeviceName, - WideDosDeviceName, - Index, - &DeviceName, - &DosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - return Status; - } - - /* Now create the device */ - Status = IoCreateDevice(DriverObject, - ExtensionSize, - &DeviceName, - FILE_DEVICE_SOUND, - 0, - FALSE, - &DeviceObject); - - if ( ! NT_SUCCESS(Status) ) - { - /* These will have been allocated by ConstructSoundDeviceNames */ - FreeUnicodeStringBuffer(&DeviceName); - FreeUnicodeStringBuffer(&DosDeviceName); - - return Status; - } - - /* Create a symbolic link for the DOS deviec name */ - Status = IoCreateSymbolicLink(&DosDeviceName, &DeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - /* IoDeleteDevice( --- What are we deleting? */ - - /* These will have been allocated by ConstructSoundDeviceNames */ - FreeUnicodeStringBuffer(&DeviceName); - FreeUnicodeStringBuffer(&DosDeviceName); - - return Status; - } - - return STATUS_SUCCESS; -} - - -/* - CreateSoundDeviceWithDefaultName - - Similar to CreateSoundDevice, except this uses the default device names - ("\\Device\\WaveOut" etc.) based on the DeviceType parameter. -*/ - -NTSTATUS -CreateSoundDeviceWithDefaultName( - IN PDRIVER_OBJECT DriverObject, - IN UCHAR DeviceType, - IN UCHAR Index, - IN ULONG ExtensionSize, - OUT PDEVICE_OBJECT DeviceObject) -{ - NTSTATUS Status; - PCWSTR WideDeviceName = NULL; - PCWSTR WideDosDeviceName = NULL; - - /* Check for NULL parameters */ - if ( ( ! DriverObject ) || ( ! DeviceObject ) ) - { - DPRINT("Unexpected NULL parameter"); - return STATUS_INVALID_PARAMETER; - } - - /* Range-check */ - if ( Index >= SOUND_MAX_DEVICES ) - { - DPRINT("Device index %d exceeds maximum", Index); - return STATUS_INVALID_PARAMETER; - } - - /* Look-up the default name based on the device type */ - Status = GetDefaultSoundDeviceNameBodies(DeviceType, - &WideDeviceName, - &WideDosDeviceName); - - if ( ! NT_SUCCESS(Status) ) - { - return Status; - } - - /* Go create the device! */ - Status = CreateSoundDevice(DriverObject, - WideDeviceName, - WideDosDeviceName, - Index, - ExtensionSize, - DeviceObject); - - if ( ! NT_SUCCESS(Status) ) - { - /* No clean-up to do */ - return Status; - } - - return STATUS_SUCCESS; -} Removed: branches/silverblade-audio/lib/drivers/sound/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/hardware.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/hardware.c (removed) @@ -1,66 +1,0 @@ -/* - ReactOS Sound System - Hardware interaction helper - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 25 May 2008 - Created - - Notes: - This uses some obsolete calls (eg: HalGetInterruptVector). - Might be worth updating this in future to use some of the - recommended functions like IoReportDetectedDevice and - IoReportResourceForDetection... -*/ - -#include <ntddk.h> -#include <ntddsnd.h> -#include <debug.h> - -/* NOTE: Disconnect using IoDisconnectInterrupt */ - -NTSTATUS -LegacyAttachInterrupt( - IN PDEVICE_OBJECT DeviceObject, - IN UCHAR Irq, - IN PKSERVICE_ROUTINE ServiceRoutine, - OUT PKINTERRUPT* InterruptObject) -{ - NTSTATUS Status; - ULONG Vector; - KIRQL IrqLevel; - KAFFINITY Affinity; - - DPRINT("Obtaining interrupt vector"); - - Vector = HalGetInterruptVector(Isa, - 0, - Irq, - Irq, - &IrqLevel, - &Affinity); - - DPRINT("Vector %d", Vector); - DPRINT("Connecting IRQ %d", Irq); - - Status = IoConnectInterrupt(InterruptObject, - ServiceRoutine, - DeviceObject, - NULL, - Vector, - IrqLevel, - IrqLevel, - Latched, - FALSE, - Affinity, - FALSE); - - if ( Status == STATUS_INVALID_PARAMETER ) - { - Status = STATUS_DEVICE_CONFIGURATION_ERROR; - } - - return Status; -} Added: branches/silverblade-audio/lib/drivers/sound/legacy/legacy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/legacy/legacy.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/legacy/legacy.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="audioleg" type="staticlibrary" allowwarnings="true"> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <include base="soundblaster">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>devname.c</file> + <file>hardware.c</file> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/legacy/legacy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/silverblade-audio/lib/drivers/sound/midiuart.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/midiuart.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/midiuart.c (removed) @@ -1,93 +1,0 @@ -/* - ReactOS Sound System - MIDI UART support - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 26 May 2008 - Created - - Notes: - Functions documented in midiuart.h -*/ - -#include <ntddk.h> -#include "midiuart.h" - -BOOLEAN -WaitForMidiUartStatus( - IN PUCHAR UartBasePort, - IN UCHAR StatusFlags, - IN ULONG Timeout) -{ - ULONG RemainingTime = Timeout; - - while ( RemainingTime -- ) - { - if ( READ_MIDIUART_STATUS(UartBasePort) & StatusFlags ) - { - return TRUE; - } - } - - return FALSE; -} - -BOOLEAN -WriteMidiUartByte( - IN PUCHAR UartBasePort, - IN UCHAR Data, - IN ULONG Timeout) -{ - if ( ! WaitForMidiUartCTS(UartBasePort, Timeout) ) - { - return FALSE; - } - - WRITE_MIDIUART_DATA(UartBasePort, Data); - - return TRUE; -} - -BOOLEAN -WriteMidiUartMulti( - IN PUCHAR UartBasePort, - IN PUCHAR Data, - IN ULONG DataLength, - IN ULONG Timeout) -{ - ULONG DataIndex; - - for ( DataIndex = 0; DataIndex < DataLength; ++ DataIndex ) - { - if ( ! WriteMidiUartByte(UartBasePort, Data[DataIndex], Timeout) ) - { - /* We failed - don't try writing any more */ - return FALSE; - } - } - - return TRUE; -} - -BOOLEAN -ReadMidiUartByte( - IN PUCHAR UartBasePort, - OUT UCHAR* Data, - IN ULONG Timeout) -{ - if ( ! Data ) - { - return FALSE; - } - - if ( ! WaitForMidiUartDTR(UartBasePort, Timeout) ) - { - return FALSE; - } - - *Data = READ_MIDIUART_DATA(UartBasePort); - - return TRUE; -} Removed: branches/silverblade-audio/lib/drivers/sound/sbdsp.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sbdsp.c (removed) @@ -1,359 +1,0 @@ -/* - ReactOS Sound System - Sound Blaster DSP support - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 26 May 2008 - Created - - Notes: - Functions documented in sbdsp.h -*/ - -#include <ntddk.h> -#include <debug.h> - -#include <time.h> -#include <sbdsp.h> - -NTSTATUS -SbDspReset( - IN PUCHAR BasePort, - IN ULONG Timeout) -{ - ULONG Expiry; - KIRQL CurrentIrqLevel = KeGetCurrentIrql(); - BOOLEAN DataAvailable = FALSE; - - /* Should be called from DriverEntry with this IRQL */ - ASSERT(CurrentIrqLevel == PASSIVE_LEVEL); - - WRITE_SB_DSP_RESET(BasePort, 0x01); - SleepMs(50); /* Should be enough */ - WRITE_SB_DSP_RESET(BasePort, 0x00); - - Expiry = QuerySystemTimeMs() + Timeout; - - /* Wait for data to be available */ - while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) - { - if ( SB_DSP_DATA_AVAILABLE(BasePort) ) - { - DataAvailable = TRUE; - break; - } - } - - if ( ! DataAvailable ) - { - return STATUS_TIMEOUT; - } - - /* Data is available - wait for the "DSP ready" code */ - while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) - { - if ( READ_SB_DSP_DATA(BasePort) == SB_DSP_READY ) - { - return STATUS_SUCCESS; - } - } - - return STATUS_TIMEOUT; -} - -NTSTATUS -SbDspWaitToWrite( - IN PUCHAR BasePort, - IN ULONG Timeout) -{ - ULONG Expiry = QuerySystemTimeMs() + Timeout; - - while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) - { - if ( SB_DSP_CLEAR_TO_SEND(BasePort) ) - { - return STATUS_SUCCESS; - } - } - - return STATUS_TIMEOUT; -} - -NTSTATUS -SbDspWaitToRead( - IN PUCHAR BasePort, - IN ULONG Timeout) -{ - ULONG Expiry = QuerySystemTimeMs() + Timeout; - - while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) - { - if ( SB_DSP_DATA_AVAILABLE(BasePort) ) - { - return STATUS_SUCCESS; - } - } - - return STATUS_TIMEOUT; -} - -NTSTATUS -SbDspWrite( - IN PUCHAR BasePort, - IN UCHAR DataByte, - IN ULONG Timeout) -{ - NTSTATUS Status; - - Status = SbDspWaitToWrite(BasePort, Timeout); - - if ( Status != STATUS_SUCCESS ) - { - return Status; - } - - DbgPrint("SBDSP - Writing %02x\n", DataByte); - WRITE_SB_DSP_DATA(BasePort, DataByte); - - return STATUS_SUCCESS; -} - -NTSTATUS -SbDspRead( - IN PUCHAR BasePort, - OUT PUCHAR DataByte, - IN ULONG Timeout) -{ - NTSTATUS Status; - - if ( ! DataByte ) - { - return STATUS_INVALID_PARAMETER_2; - } - - Status = SbDspWaitToRead(BasePort, Timeout); - - if ( Status != STATUS_SUCCESS ) - { - return Status; - } - - *DataByte = READ_SB_DSP_DATA(BasePort); - DbgPrint("SBDSP - Read %02x\n", *DataByte); - - return STATUS_SUCCESS; -} - -NTSTATUS -SbDspGetVersion( - IN PUCHAR BasePort, - OUT PUCHAR MajorVersion, - OUT PUCHAR MinorVersion, - IN ULONG Timeout) -{ - NTSTATUS Status; - - /* Make sure our parameters are sane */ - if ( ! MajorVersion ) - return STATUS_INVALID_PARAMETER_2; - - if ( ! MinorVersion ) - return STATUS_INVALID_PARAMETER_3; - - /* Send version request */ - Status = SbDspWrite(BasePort, SB_DSP_VERSION, Timeout); - if ( Status != STATUS_SUCCESS ) - return Status; - - /* Get the major version */ - Status = SbDspRead(BasePort, MajorVersion, Timeout); - if ( Status != STATUS_SUCCESS ) - return FALSE; - - /* Get the minor version */ - Status = SbDspRead(BasePort, MinorVersion, Timeout); - return Status; -} - -NTSTATUS -SbDspEnableSpeaker( - IN PUCHAR BasePort, - IN ULONG Timeout) -{ - return SbDspWrite(BasePort, SB_DSP_SPEAKER_ON, Timeout); -} - -NTSTATUS -SbDspDisableSpeaker( - IN PUCHAR BasePort, - IN ULONG Timeout) -{ - return SbDspWrite(BasePort, SB_DSP_SPEAKER_OFF, Timeout); -} - -/* - VirtualBox doesn't seem to support this. -*/ -NTSTATUS -SbDspIsSpeakerEnabled( - IN PUCHAR BasePort, - OUT PBOOLEAN IsEnabled, - IN ULONG Timeout) -{ - NTSTATUS Status; - UCHAR SpeakerStatus = 0; - - if ( ! IsEnabled ) - return STATUS_INVALID_PARAMETER_2; - - /* Request the speaker status */ - Status = SbDspWrite(BasePort, SB_DSP_SPEAKER_STATUS, Timeout); - if ( Status != STATUS_SUCCESS ) - return Status; - - /* Obtain the status */ - Status = SbDspRead(BasePort, &SpeakerStatus, Timeout); - if ( Status != STATUS_SUCCESS ) - return Status; - - DbgPrint("SBDSP - SpeakerStatus is %02x\n", SpeakerStatus); - *IsEnabled = (SpeakerStatus == 0xFF); - - return STATUS_SUCCESS; -} - -BOOLEAN -SbDspIsValidInputRate( - IN UCHAR MajorVersion, - IN UCHAR MinorVersion, - IN USHORT Rate, - IN BOOLEAN Stereo) -{ - if ( MajorVersion == 1 ) - { - if ( Stereo ) - return FALSE; - - return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); - } - else if ( MajorVersion == 2 ) - { - if ( Stereo ) - return FALSE; - - if ( MinorVersion == 0 ) - return ( ( Rate >= 4000 ) && ( Rate <= 15000 ) ); - else - return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); - } - else if ( MajorVersion == 3 ) - { - if ( Stereo ) - return FALSE; - - return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); - } - else /* 4.00 and above */ - { - return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); - } -} - -BOOLEAN -SbDspIsValidOutputRate( - IN UCHAR MajorVersion, - IN UCHAR MinorVersion, - IN USHORT Rate, - IN BOOLEAN Stereo) -{ - if ( MajorVersion == 1 ) - { - if ( Stereo ) - return FALSE; - - return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); - } - else if ( MajorVersion == 2 ) - { - if ( Stereo ) - return FALSE; - - if ( MinorVersion == 0 ) - return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); - else - return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); - } - else if ( MajorVersion == 3 ) - { - if ( ! Stereo ) - return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); - else - return ( ( Rate >= 11025 ) && ( Rate <= 22050 ) ); - } - else /* 4.00 and above */ - { - return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); - } -} - -/* Internal routine - call only after submitting one of the rate commands */ -NTSTATUS -SbDsp4WriteRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - /* NOTE - No check for validity of rate! */ - - /* Write high byte */ - Status = SbDspWrite(BasePort, (Rate & 0xff00) >> 8, Timeout); - if ( Status != STATUS_SUCCESS ) - return Status; - - /* Write low byte */ - Status = SbDspWrite(BasePort, Rate & 0xff, Timeout); - if ( Status != STATUS_SUCCESS ) - return Status; - - return Status; -} - -NTSTATUS -SbDsp4SetOutputRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - /* NOTE - No check for validity of rate! */ - - /* Prepare to write the output rate */ - Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); - if ( Status != STATUS_SUCCESS ) - return Status; - - return SbDsp4WriteRate(BasePort, Rate, Timeout); -} - -NTSTATUS -SbDsp4SetInputRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - /* NOTE - No check for validity of rate! */ - - /* Prepare to write the input rate */ - Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); - if ( Status != STATUS_SUCCESS ) - return Status; - - return SbDsp4WriteRate(BasePort, Rate, Timeout); -} Added: branches/silverblade-audio/lib/drivers/sound/shared/shared.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/shared/shared.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/shared/shared.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="audio" type="staticlibrary" allowwarnings="true"> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <include base="soundblaster">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>time.c</file> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/shared/shared.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sound.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sound.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,13 +1,16 @@ <?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="sound" type="staticlibrary" allowwarnings="true"> - <define name="__NTDRIVER__"/> - <define name="KERNEL"/> - <include base="sound">.</include> - <include base="ReactOS">include/reactos/libs/sound</include> - <file>devname.c</file> - <file>hardware.c</file> - <file>midiuart.c</file> - <file>sbdsp.c</file> - <file>time.c</file> -</module> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="legacy"> + <xi:include href="legacy/legacy.rbuild" /> + </directory> + <directory name="shared"> + <xi:include href="shared/shared.rbuild" /> + </directory> + <directory name="soundblaster"> + <xi:include href="soundblaster/soundblaster.rbuild" /> + </directory> + <directory name="uartmidi"> + <xi:include href="uartmidi/uartmidi.rbuild" /> + </directory> +</group> Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/dsp_io.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/dsp_io.c (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/dsp_io.c [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,148 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + General I/O + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 2 July 2008 - Created (split from sbdsp.c) + + Notes: + Functions documented in sbdsp.h +*/ + +#include <ntddk.h> +#include <debug.h> + +#include <time.h> +#include <sbdsp.h> + +NTSTATUS +SbDspReset( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry; + KIRQL CurrentIrqLevel = KeGetCurrentIrql(); + BOOLEAN DataAvailable = FALSE; + + /* Should be called from DriverEntry with this IRQL */ + ASSERT(CurrentIrqLevel == PASSIVE_LEVEL); + + WRITE_SB_DSP_RESET(BasePort, 0x01); + SleepMs(50); /* Should be enough */ + WRITE_SB_DSP_RESET(BasePort, 0x00); + + Expiry = QuerySystemTimeMs() + Timeout; + + /* Wait for data to be available */ + while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) + { + if ( SB_DSP_DATA_AVAILABLE(BasePort) ) + { + DataAvailable = TRUE; + break; + } + } + + if ( ! DataAvailable ) + { + return STATUS_TIMEOUT; + } + + /* Data is available - wait for the "DSP ready" code */ + while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) + { + if ( READ_SB_DSP_DATA(BasePort) == SB_DSP_READY ) + { + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWaitToWrite( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry = QuerySystemTimeMs() + Timeout; + + while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) + { + if ( SB_DSP_CLEAR_TO_SEND(BasePort) ) + { + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWaitToRead( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry = QuerySystemTimeMs() + Timeout; + + while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) + { + if ( SB_DSP_DATA_AVAILABLE(BasePort) ) + { + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWrite( + IN PUCHAR BasePort, + IN UCHAR DataByte, + IN ULONG Timeout) +{ + NTSTATUS Status; + + Status = SbDspWaitToWrite(BasePort, Timeout); + + if ( Status != STATUS_SUCCESS ) + { + return Status; + } + + DbgPrint("SBDSP - Writing %02x\n", DataByte); + WRITE_SB_DSP_DATA(BasePort, DataByte); + + return STATUS_SUCCESS; +} + +NTSTATUS +SbDspRead( + IN PUCHAR BasePort, + OUT PUCHAR DataByte, + IN ULONG Timeout) +{ + NTSTATUS Status; + + if ( ! DataByte ) + { + return STATUS_INVALID_PARAMETER_2; + } + + Status = SbDspWaitToRead(BasePort, Timeout); + + if ( Status != STATUS_SUCCESS ) + { + return Status; + } + + *DataByte = READ_SB_DSP_DATA(BasePort); + DbgPrint("SBDSP - Read %02x\n", *DataByte); + + return STATUS_SUCCESS; +} Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/dsp_io.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/mixer.c (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/mixer.c [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,21 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + Mixer routines + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 2 July 2008 - Created + + Notes: + Functions documented in sbdsp.h +*/ + +#include <ntddk.h> +#include <debug.h> + +#include <sbdsp.h> + +/* Stub... */ Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/mixer.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/rate.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/rate.c (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/rate.c [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,154 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + Sample rate routines + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 2 July 2008 - Created (split from sbdsp.c) + + Notes: + Functions documented in sbdsp.h +*/ + +#include <ntddk.h> +#include <debug.h> + +#include <sbdsp.h> + +BOOLEAN +SbDspIsValidInputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo) +{ + if ( MajorVersion == 1 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); + } + else if ( MajorVersion == 2 ) + { + if ( Stereo ) + return FALSE; + + if ( MinorVersion == 0 ) + return ( ( Rate >= 4000 ) && ( Rate <= 15000 ) ); + else + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + } + else if ( MajorVersion == 3 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); + } + else /* 4.00 and above */ + { + return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); + } +} + +BOOLEAN +SbDspIsValidOutputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo) +{ + if ( MajorVersion == 1 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); + } + else if ( MajorVersion == 2 ) + { + if ( Stereo ) + return FALSE; + + if ( MinorVersion == 0 ) + return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); + else + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + } + else if ( MajorVersion == 3 ) + { + if ( ! Stereo ) + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + else + return ( ( Rate >= 11025 ) && ( Rate <= 22050 ) ); + } + else /* 4.00 and above */ + { + return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); + } +} + +/* Internal routine - call only after submitting one of the rate commands */ +NTSTATUS +SbDsp4WriteRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ + + /* Write high byte */ + Status = SbDspWrite(BasePort, (Rate & 0xff00) >> 8, Timeout); + if ( Status != STATUS_SUCCESS ) + return Status; + + /* Write low byte */ + Status = SbDspWrite(BasePort, Rate & 0xff, Timeout); + if ( Status != STATUS_SUCCESS ) + return Status; + + return Status; +} + +NTSTATUS +SbDsp4SetOutputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ + + /* Prepare to write the output rate */ + Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); + if ( Status != STATUS_SUCCESS ) + return Status; + + return SbDsp4WriteRate(BasePort, Rate, Timeout); +} + +NTSTATUS +SbDsp4SetInputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ + + /* Prepare to write the input rate */ + Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); + if ( Status != STATUS_SUCCESS ) + return Status; + + return SbDsp4WriteRate(BasePort, Rate, Timeout); +} + Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/rate.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/soundblaster.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/soundblaster.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/soundblaster.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="soundblaster" type="staticlibrary" allowwarnings="true"> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <include base="soundblaster">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>dsp_io.c</file> + <file>version.c</file> + <file>speaker.c</file> + <file>rate.c</file> + <file>mixer.c</file> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/soundblaster.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/speaker.c (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/speaker.c [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,66 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + Speaker commands + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 2 July 2008 - Created (split from sbdsp.c) + + Notes: + Functions documented in sbdsp.h +*/ + +#include <ntddk.h> +#include <debug.h> + +#include <sbdsp.h> + +NTSTATUS +SbDspEnableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + return SbDspWrite(BasePort, SB_DSP_SPEAKER_ON, Timeout); +} + +NTSTATUS +SbDspDisableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + return SbDspWrite(BasePort, SB_DSP_SPEAKER_OFF, Timeout); +} + +/* + VirtualBox doesn't seem to support this. +*/ +NTSTATUS +SbDspIsSpeakerEnabled( + IN PUCHAR BasePort, + OUT PBOOLEAN IsEnabled, + IN ULONG Timeout) +{ + NTSTATUS Status; + UCHAR SpeakerStatus = 0; + + if ( ! IsEnabled ) + return STATUS_INVALID_PARAMETER_2; + + /* Request the speaker status */ + Status = SbDspWrite(BasePort, SB_DSP_SPEAKER_STATUS, Timeout); + if ( Status != STATUS_SUCCESS ) + return Status; + + /* Obtain the status */ + Status = SbDspRead(BasePort, &SpeakerStatus, Timeout); + if ( Status != STATUS_SUCCESS ) + return Status; + + DbgPrint("SBDSP - SpeakerStatus is %02x\n", SpeakerStatus); + *IsEnabled = (SpeakerStatus == 0xFF); + + return STATUS_SUCCESS; +} Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/speaker.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/silverblade-audio/lib/drivers/sound/soundblaster/version.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/soundblaster/version.c (added) +++ branches/silverblade-audio/lib/drivers/sound/soundblaster/version.c [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,50 @@ +/* + ReactOS Sound System + Sound Blaster DSP support + Version routine + + Author: + Andrew Greenwood (silverblade(a)reactos.org) + + History: + 2 July 2008 - Created (split from sbdsp.c) + + Notes: + Functions documented in sbdsp.h +*/ + +#include <ntddk.h> +#include <debug.h> + +#include <sbdsp.h> + +NTSTATUS +SbDspGetVersion( + IN PUCHAR BasePort, + OUT PUCHAR MajorVersion, + OUT PUCHAR MinorVersion, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* Make sure our parameters are sane */ + if ( ! MajorVersion ) + return STATUS_INVALID_PARAMETER_2; + + if ( ! MinorVersion ) + return STATUS_INVALID_PARAMETER_3; + + /* Send version request */ + Status = SbDspWrite(BasePort, SB_DSP_VERSION, Timeout); + if ( Status != STATUS_SUCCESS ) + return Status; + + /* Get the major version */ + Status = SbDspRead(BasePort, MajorVersion, Timeout); + if ( Status != STATUS_SUCCESS ) + return FALSE; + + /* Get the minor version */ + Status = SbDspRead(BasePort, MinorVersion, Timeout); + return Status; +} Propchange: branches/silverblade-audio/lib/drivers/sound/soundblaster/version.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/silverblade-audio/lib/drivers/sound/time.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/time.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/time.c (removed) @@ -1,49 +1,0 @@ -/* - ReactOS Sound System - Timing helper - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 31 May 2008 - Created - - Notes: - Have checked timing in DebugView. A 10,000ms delay covered a period - of 124.305 sec to 134.308 sec. Not 100% accurate but likely down to - the delays in submitting the debug strings? -*/ - -/* - Nanoseconds are fun! You must try some! - 1 ns = .000000001 seconds = .0000001 ms - 100 ns = .0000001 seconds = .00001 ms - 10000 ns = .00001 seconds = .001 ms - 1000000 ns = .001 seconds = 1 ms -*/ - -#include <ntddk.h> - -VOID -SleepMs(ULONG Milliseconds) -{ - LARGE_INTEGER Period; - - Period.QuadPart = -Milliseconds; - Period.QuadPart *= 10000; - - KeDelayExecutionThread(KernelMode, FALSE, &Period); -} - -ULONG -QuerySystemTimeMs() -{ - LARGE_INTEGER Time; - - KeQuerySystemTime(&Time); - - Time.QuadPart /= 10000; - - return (ULONG) Time.QuadPart; -} - Added: branches/silverblade-audio/lib/drivers/sound/uartmidi/uartmidi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/uartmidi/uartmidi.rbuild (added) +++ branches/silverblade-audio/lib/drivers/sound/uartmidi/uartmidi.rbuild [iso-8859-1] Tue Jul 1 21:16:51 2008 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="uartmidi" type="staticlibrary" allowwarnings="true"> + <define name="__NTDRIVER__"/> + <define name="KERNEL"/> + <include base="soundblaster">.</include> + <include base="ReactOS">include/reactos/libs/sound</include> + <file>midiuart.c</file> +</module> Propchange: branches/silverblade-audio/lib/drivers/sound/uartmidi/uartmidi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[silverblade] 34244: Fixed some bugs in previous commit, implemented validation of sample rate.
by silverblade＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: silverblade Date: Tue Jul 1 18:02:07 2008 New Revision: 34244 URL: http://svn.reactos.org/svn/reactos?rev=34244&view=rev Log: Fixed some bugs in previous commit, implemented validation of sample rate. Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h branches/silverblade-audio/lib/drivers/sound/sbdsp.c Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Tue Jul 1 18:02:07 2008 @@ -171,46 +171,46 @@ DbgPrint("Resetting Sound Blaster DSP at 0x220\n"); result = SbDspReset((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); DbgPrint("Reset was %s\n", - NT_SUCCESS(result) ? "successful" : "unsuccessful"); + result == STATUS_SUCCESS ? "successful" : "unsuccessful"); /* 0x240, we don't expect to work */ DbgPrint("Resetting Sound Blaster DSP at 0x240\n"); result = SbDspReset((PUCHAR)0x240, SB_DEFAULT_TIMEOUT); DbgPrint("Reset was %s\n", - NT_SUCCESS(result) ? "successful" : "unsuccessful"); + result == STATUS_SUCCESS ? "successful" : "unsuccessful"); /* Try getting version */ DbgPrint("Retrieving Sound Blaster version...\n"); result = SbDspGetVersion((PUCHAR)0x220, &major, &minor, SB_DEFAULT_TIMEOUT); DbgPrint("Version retrival was %s\n", - NT_SUCCESS(result) ? "successful" : "unsuccessful"); + result == STATUS_SUCCESS ? "successful" : "unsuccessful"); DbgPrint("Sound Blaster DSP version is %d.%02d\n", major, minor); result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); DbgPrint("Speaker state retrieval %s\n", - NT_SUCCESS(result) ? "succeeded" : "failed"); + result == STATUS_SUCCESS ? "succeeded" : "failed"); DbgPrint("Speaker state is presently %s\n", speaker_state ? "ENABLED" : "DISABLED"); result = SbDspEnableSpeaker((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); DbgPrint("Speaker enable request %s\n", - NT_SUCCESS(result) ? "succeeded" : "failed"); + result == STATUS_SUCCESS ? "succeeded" : "failed"); result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); DbgPrint("Speaker state retrieval %s\n", - NT_SUCCESS(result) ? "succeeded" : "failed"); + result == STATUS_SUCCESS ? "succeeded" : "failed"); DbgPrint("Speaker state is now %s\n", speaker_state ? "ENABLED" : "DISABLED"); result = SbDspDisableSpeaker((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); DbgPrint("Speaker disable request %s\n", - NT_SUCCESS(result) ? "succeeded" : "failed"); + result == STATUS_SUCCESS ? "succeeded" : "failed"); result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); DbgPrint("Speaker state retrieval %s\n", - NT_SUCCESS(result) ? "succeeded" : "failed"); + result == STATUS_SUCCESS ? "succeeded" : "failed"); DbgPrint("Speaker state is now %s\n", speaker_state ? "ENABLED" : "DISABLED"); Modified: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] Tue Jul 1 18:02:07 2008 @@ -15,7 +15,19 @@ #ifndef ROS_SOUND_SBDSP_H #define ROS_SOUND_SBDSP_H -#include <sound/time.h> +/* + Product versions + DSP 1.0, 1.5, 2.0, 2.01 correspond with respective Sound Blaster versions. + DSP 3.xx is Sound Blaster Pro + DSP 4.xx is Sound Blaster 16 +*/ + +#define SOUND_BLASTER_1_0 L"Sound Blaster 1.0" +#define SOUND_BLASTER_1_5 L"Sound Blaster 1.5" +#define SOUND_BLASTER_2_0 L"Sound Blaster 2.0" +#define SOUND_BLASTER_PRO L"Sound Blaster Pro" +#define SOUND_BLASTER_16 L"Sound Blaster 16" + /* Sound Blaster ports I/O @@ -155,19 +167,33 @@ IN ULONG Timeout); /* - Validate the sample rate - * DSP 4.xx only + Validate the input sample rate. The major and minor versions are required + to determine the capabilities of the card. */ BOOLEAN -SbDspIsValidRate( - IN USHORT Rate); +SbDspIsValidInputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo); + +/* + Validate the output sample rate. The major and minor versions are required + to determine the capabilities of the card. +*/ +BOOLEAN +SbDspIsValidOutputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo); /* Set the output/playback rate * DSP 4.xx only */ NTSTATUS -SbDspSetOutputRate( +SbDsp4SetOutputRate( IN PUCHAR BasePort, IN USHORT Rate, IN ULONG Timeout); @@ -177,7 +203,7 @@ * DSP 4.xx only */ NTSTATUS -SbDspSetInputRate( +SbDsp4SetInputRate( IN PUCHAR BasePort, IN USHORT Rate, IN ULONG Timeout); Modified: branches/silverblade-audio/lib/drivers/sound/sbdsp.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] Tue Jul 1 18:02:07 2008 @@ -109,7 +109,7 @@ Status = SbDspWaitToWrite(BasePort, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) { return Status; } @@ -135,7 +135,7 @@ Status = SbDspWaitToRead(BasePort, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) { return Status; } @@ -164,12 +164,12 @@ /* Send version request */ Status = SbDspWrite(BasePort, SB_DSP_VERSION, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return Status; /* Get the major version */ Status = SbDspRead(BasePort, MajorVersion, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return FALSE; /* Get the minor version */ @@ -194,10 +194,7 @@ } /* - BUG? - It seems under VirtualBox this returns 0x05, irrespective - of the speaker state. I'm not sure if this will also occur - on real hardware. + VirtualBox doesn't seem to support this. */ NTSTATUS SbDspIsSpeakerEnabled( @@ -213,12 +210,12 @@ /* Request the speaker status */ Status = SbDspWrite(BasePort, SB_DSP_SPEAKER_STATUS, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return Status; /* Obtain the status */ Status = SbDspRead(BasePort, &SpeakerStatus, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return Status; DbgPrint("SBDSP - SpeakerStatus is %02x\n", SpeakerStatus); @@ -228,72 +225,135 @@ } BOOLEAN -SbDspIsValidRate( - IN USHORT Rate) -{ - /* Not sure if this range is 100% correct */ - return ( ( Rate >= 5000 ) && ( Rate <= 45000 ) ); +SbDspIsValidInputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo) +{ + if ( MajorVersion == 1 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); + } + else if ( MajorVersion == 2 ) + { + if ( Stereo ) + return FALSE; + + if ( MinorVersion == 0 ) + return ( ( Rate >= 4000 ) && ( Rate <= 15000 ) ); + else + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + } + else if ( MajorVersion == 3 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 13000 ) ); + } + else /* 4.00 and above */ + { + return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); + } +} + +BOOLEAN +SbDspIsValidOutputRate( + IN UCHAR MajorVersion, + IN UCHAR MinorVersion, + IN USHORT Rate, + IN BOOLEAN Stereo) +{ + if ( MajorVersion == 1 ) + { + if ( Stereo ) + return FALSE; + + return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); + } + else if ( MajorVersion == 2 ) + { + if ( Stereo ) + return FALSE; + + if ( MinorVersion == 0 ) + return ( ( Rate >= 4000 ) && ( Rate <= 23000 ) ); + else + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + } + else if ( MajorVersion == 3 ) + { + if ( ! Stereo ) + return ( ( Rate >= 4000 ) && ( Rate <= 44100 ) ); + else + return ( ( Rate >= 11025 ) && ( Rate <= 22050 ) ); + } + else /* 4.00 and above */ + { + return ( ( Rate >= 5000 ) && ( Rate <= 44100 ) ); + } } /* Internal routine - call only after submitting one of the rate commands */ NTSTATUS -SbDspWriteRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - if ( ! SbDspIsValidRate(Rate) ) - return STATUS_INVALID_PARAMETER_2; +SbDsp4WriteRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ /* Write high byte */ Status = SbDspWrite(BasePort, (Rate & 0xff00) >> 8, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return Status; /* Write low byte */ Status = SbDspWrite(BasePort, Rate & 0xff, Timeout); - if ( ! NT_SUCCESS(Status) ) + if ( Status != STATUS_SUCCESS ) return Status; return Status; } NTSTATUS -SbDspSetOutputRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - if ( ! SbDspIsValidRate(Rate) ) - return STATUS_INVALID_PARAMETER_2; +SbDsp4SetOutputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ /* Prepare to write the output rate */ Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); - if ( ! NT_SUCCESS(Status) ) - return Status; - - return SbDspWriteRate(BasePort, Rate, Timeout); -} - -NTSTATUS -SbDspSetInputRate( - IN PUCHAR BasePort, - IN USHORT Rate, - IN ULONG Timeout) -{ - NTSTATUS Status; - - if ( ! SbDspIsValidRate(Rate) ) - return STATUS_INVALID_PARAMETER_2; + if ( Status != STATUS_SUCCESS ) + return Status; + + return SbDsp4WriteRate(BasePort, Rate, Timeout); +} + +NTSTATUS +SbDsp4SetInputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + /* NOTE - No check for validity of rate! */ /* Prepare to write the input rate */ Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); - if ( ! NT_SUCCESS(Status) ) - return Status; - - return SbDspWriteRate(BasePort, Rate, Timeout); -} + if ( Status != STATUS_SUCCESS ) + return Status; + + return SbDsp4WriteRate(BasePort, Rate, Timeout); +}

1 0

[janderwald] 34243: - add AUTOCHECKBOX style to all 3 checkboxes on general page for all languages - enable/disable checkboxes when normal/diagnostic startup is selected - automatically select normal startup checkbox as other options are not implemented - bug 1986
by janderwald＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: janderwald Date: Tue Jul 1 17:36:31 2008 New Revision: 34243 URL: http://svn.reactos.org/svn/reactos?rev=34243&view=rev Log: - add AUTOCHECKBOX style to all 3 checkboxes on general page for all languages - enable/disable checkboxes when normal/diagnostic startup is selected - automatically select normal startup checkbox as other options are not implemented - bug 1986 Modified: trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig/lang/de-DE.rc trunk/reactos/base/applications/msconfig/lang/el-GR.rc trunk/reactos/base/applications/msconfig/lang/en-US.rc trunk/reactos/base/applications/msconfig/lang/es-ES.rc trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/base/applications/msconfig/lang/hu-HU.rc trunk/reactos/base/applications/msconfig/lang/id-ID.rc trunk/reactos/base/applications/msconfig/lang/it-IT.rc trunk/reactos/base/applications/msconfig/lang/ko-KR.rc trunk/reactos/base/applications/msconfig/lang/nb-NO.rc trunk/reactos/base/applications/msconfig/lang/nl-NL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pt-BR.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/sk-SK.rc trunk/reactos/base/applications/msconfig/lang/th-TH.rc trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/base/applications/msconfig/lang/zh-CN.rc Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -12,17 +12,42 @@ HWND hGeneralPage; HWND hGeneralDialog; +VOID +EnableCheckboxControls(HWND hDlg, BOOL bEnable) +{ + EnableWindow(GetDlgItem(hDlg, IDC_CBX_SYSTEM_INI), bEnable); + EnableWindow(GetDlgItem(hDlg, IDC_CBX_SYSTEM_SERVICE), bEnable); + EnableWindow(GetDlgItem(hDlg, IDC_CBX_STARTUP_ITEM), bEnable); +} + + INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - switch (message) { + switch (message) + { case WM_INITDIALOG: hGeneralDialog = hDlg; SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + /* FIXME */ + SendDlgItemMessage(hDlg, IDC_CBX_NORMAL_START, BM_SETCHECK, BST_CHECKED, 0); + EnableCheckboxControls(hDlg, FALSE); return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_CBX_NORMAL_START: + case IDC_CBX_DIAGNOSTIC_START: + EnableCheckboxControls(hDlg, FALSE); + break; + case IDC_CBX_SELECTIVE_STARTUP: + EnableCheckboxControls(hDlg, TRUE); + break; + default: + break; + } } return 0; } Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/bg-BG.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -69,9 +69,9 @@ CONTROL "&Íîðìàëíî ïóñêàíå çàðåæäàíå íà âñè÷êè âîäà÷è (äðàéâåðè) è óñëóãè", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 CONTROL "&Ðàçñëåäâàùî ïóñêàíå- çàðåæäàíå ñàìî íà îñíîâíèòå âîäà÷è è óñëóãè ", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 CONTROL "Èçáèðàåìî ïóñêàíå", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - CHECKBOX "Çàðåæäàíå íà ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - CHECKBOX "&Çàðåæäàíå íà ñèñòåìíèòå óñëóãè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - CHECKBOX "Çàðåæäàíå íà ïóñêîâèòå ïðåäìåòè", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 + AUTOCHECKBOX "Çàðåæäàíå íà ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 + AUTOCHECKBOX "&Çàðåæäàíå íà ñèñòåìíèòå óñëóãè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 + AUTOCHECKBOX "Çàðåæäàíå íà ïóñêîâèòå ïðåäìåòè", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/ca-ES.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "Nor&mální sputìní - naèíst vechny ovladaèe zaøízení a sluby", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 215, 10 CONTROL "&Diagnostické sputìní - naèíst jen základní ovladaèe zaøízení a sluby", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 255, 10 CONTROL "&Výbìrové sputìní", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 72, 10 - CHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 115, 10 - CHECKBOX "&Naèíst systémové sluby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 - CHECKBOX "N&aèíst poloky Po sputìní", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10 + AUTOCHECKBOX "&Zpracovat soubor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 115, 10 + AUTOCHECKBOX "&Naèíst systémové sluby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 + AUTOCHECKBOX "N&aèíst poloky Po sputìní", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/de-DE.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -69,9 +69,9 @@ CONTROL "&Normaler Systemstart - Alle Gerätetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 210, 10 CONTROL "&Diagnosesystemstart - Nur grundlegende Geräte und Dienste laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10 CONTROL "B&enutzerdefinierter Systemstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 120, 10 - CHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 - CHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10 + AUTOCHECKBOX "D&atei SYSTEM.INI verarbeiten", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 + AUTOCHECKBOX "&Systemdienste laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "S&ystemstartelemente laden", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/el-GR.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Öüñôùóç õðçñåóéþí óõóôÞìáôùí", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Öü&ñôùóç Startup áíôéêåéìÝíùí", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Öüñôùóç õðçñåóéþí óõóôÞìáôùí", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Öü&ñôùóç Startup áíôéêåéìÝíùí", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/en-US.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/es-ES.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "Inicio &Normal - cargar todos los controladores de unidades y servicios", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 240, 10 CONTROL "Inicio de &Diagnostico - cargar sólo los controladores y servicios básicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 240, 10 CONTROL "Inicio S&electivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 - CHECKBOX "&Cargar Servicios del Sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 110, 10 - CHECKBOX "C&argar elementos de Inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10 + AUTOCHECKBOX "P&rocesar archivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 + AUTOCHECKBOX "&Cargar Servicios del Sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 110, 10 + AUTOCHECKBOX "C&argar elementos de Inicio", IDC_CBX_STARTUP_ITEM, 30, 110, 110, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "Démarrage &Normal - charge tous les drivers et services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10 CONTROL "Démarrage &Diagnostic - charge les périphériques de base et services seulement", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 CONTROL "Démarrage &Sélectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 75, 10 - CHECKBOX "T&raiter le fichier SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 100, 10 - CHECKBOX "&Charger les Services Système", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 - CHECKBOX "Charger les éléments de démarrage", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "T&raiter le fichier SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 100, 10 + AUTOCHECKBOX "&Charger les Services Système", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 + AUTOCHECKBOX "Charger les éléments de démarrage", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/hu-HU.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -70,9 +70,9 @@ CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/id-ID.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "&Normal Startup - mengambil semua device drivers dan layanan", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostik Startup - mengambil hanya devices dan layanan dasar", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "S&elektif Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&roses File SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Ambil Layanan Sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Amb&il Item Startup", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "P&roses File SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Ambil Layanan Sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Amb&il Item Startup", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/it-IT.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 205, 10 CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10 CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 95, 10 + AUTOCHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 95, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/ko-KR.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -71,9 +71,9 @@ CONTROL "º¸Åë ½ÃÀÛ(&N) - ¸ðµç µå¶óÀÌ¹ö¿Í ¼ºñ½º ·Îµå", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "Áø´Ü ½ÃÀÛ(&D) - ±âº»Àû µå¶óÀÌ¹ö¿Í ¼ºñ½º¸¸ ·Îµå", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "¼±ÅÃÀû ½ÃÀÛ(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "SYSTEM.INI ÆÄÀÏ Ã³¸®(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "½Ã½ºÅÛ ¼ºñ½º ·Îµå(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "½ÃÀÛÇÁ·Î±×·¥ ·Îµå(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "SYSTEM.INI ÆÄÀÏ Ã³¸®(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "½Ã½ºÅÛ ¼ºñ½º ·Îµå(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "½ÃÀÛÇÁ·Î±×·¥ ·Îµå(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/nb-NO.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -68,9 +68,9 @@ CONTROL "&Normal oppstart - laste inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/nl-NL.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -88,9 +88,9 @@ CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostisch opstarten - alleen elementaire stuurprogramma's en services in het geheugen laden", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "Se&lectief opstarten", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Het SYSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "Systeemservices &in het geheugen laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "&Opstartonderdelen in het geheugen laden", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "&Het SYSTEM.INI-bestand verwerken", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "Systeemservices &in het geheugen laden", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "&Opstartonderdelen in het geheugen laden", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -74,9 +74,9 @@ CONTROL "Uruchamianie &normalne - za³aduj wszystkie sterowniki urz¹dzeñ i us³ugi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "Uruchamianie &diagnostyczne - za³aduj tylko podstawowe urz¹dzenia i us³ugi", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "Uruchamianie &selektywne", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Przetwarzaj plik SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "Za³aduj &us³ugi systemowe", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Za³aduj &elementy startowe", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "&Przetwarzaj plik SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "Za³aduj &us³ugi systemowe", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Za³aduj &elementy startowe", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/pt-BR.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -74,9 +74,9 @@ CONTROL "&Inicialização normal - carregar todos os drivers de dispositivo e serviços", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "I&nicialização de diagnóstico - carregar apenas dispositivos e serviços básicos", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "Ini&cialização seletiva", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "&Processar o arquivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "Carr&egar serviços do sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Carregar i&tens de inicialização", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "&Processar o arquivo SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "Carr&egar serviços do sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Carregar i&tens de inicialização", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -70,9 +70,9 @@ CONTROL "&Îáû÷íûé çàïóñê - çàãðóçêà âñåõ äðàéâåðîâ óñòðîéñòâ è çàïóñê âñåõ ñëóæá", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 280, 10 CONTROL "&Äèàãíîñòè÷åñêèé çàïóñê - çàãðóçêà òîëüêî îñíîâíûõ äðàéâåðîâ è çàïóñê îñíîâíûõ ñëóæá", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 325, 10 CONTROL "&Âûáîðî÷íûé çàïóñê", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 100, 10 - CHECKBOX "Î&áðàáàòûâàòü ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 130, 10 - CHECKBOX "&Çàãðóæàòü ñèñòåìíûå ñëóæáû", IDC_CBX_SYSTEM_SERVICE, 30, 95, 130, 10 - CHECKBOX "Ç&àãðóæàòü ýëåìåíòû àâòîçàãðóçêè", IDC_CBX_STARTUP_ITEM, 30, 110, 140, 10 + AUTOCHECKBOX "Î&áðàáàòûâàòü ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 130, 10 + AUTOCHECKBOX "&Çàãðóæàòü ñèñòåìíûå ñëóæáû", IDC_CBX_SYSTEM_SERVICE, 30, 95, 130, 10 + AUTOCHECKBOX "Ç&àãðóæàòü ýëåìåíòû àâòîçàãðóçêè", IDC_CBX_STARTUP_ITEM, 30, 110, 140, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/sk-SK.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -72,9 +72,9 @@ CONTROL "&Normálne spustenie - naèíta vetky ovládaèe zariadení a sluby", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 225, 10 CONTROL "&Diagnostické spustenie - naèíta iba základné zariadenia a sluby", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 225, 10 CONTROL "Sele&ktívne spustenie", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 85, 10 - CHECKBOX "&Spracova súbor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 - CHECKBOX "Naèíta systé&mové sluby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 100, 10 - CHECKBOX "N&aèíta poloky Po spustení", IDC_CBX_STARTUP_ITEM, 30, 110, 100, 10 + AUTOCHECKBOX "&Spracova súbor SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10 + AUTOCHECKBOX "Naèíta systé&mové sluby", IDC_CBX_SYSTEM_SERVICE, 30, 95, 100, 10 + AUTOCHECKBOX "N&aèíta poloky Po spustení", IDC_CBX_STARTUP_ITEM, 30, 110, 100, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/th-TH.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -88,9 +88,9 @@ CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/uk-UA.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -76,9 +76,9 @@ CONTROL "&Çâè÷àéíå çàâàíòàæåííÿ - çàâàíòàæóâàòè âñ³ äðàéâåðè ³ ñëóæáè", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "&Ñêîðî÷åíå çàâàíòàæåííÿ - çóâàíòàæóâàòè ò³ëüêè îñíîâí³ äðàéâåðè ³ ñëóæáè", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "Âè&á³ðêîâå çàâàíòàæåííÿ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "Îá&ðîáëÿòè ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "Çà&âàíòàæóâàòè ñèñòåìí³ ñëóæáè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Çàâàíòàæóâàòè åëåìåíòè &àâòîçàâàíòàæåííÿ", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "Îá&ðîáëÿòè ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "Çà&âàíòàæóâàòè ñèñòåìí³ ñëóæáè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Çàâàíòàæóâàòè åëåìåíòè &àâòîçàâàíòàæåííÿ", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 Modified: trunk/reactos/base/applications/msconfig/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/zh-CN.rc [iso-8859-1] Tue Jul 1 17:36:31 2008 @@ -88,9 +88,9 @@ CONTROL "Õý³£Æô¶¯ - ¼ÓÔØËùÓÐÉè±¸Çý¶¯³ÌÐòºÍ·þÎñ(&N)", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 CONTROL "Õï¶ÏÆô¶¯ - ½ö¼ÓÔØ»ù±¾Éè±¸Çý¶¯³ÌÐòºÍ·þÎñ(&D)", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 CONTROL "ÓÐÑ¡ÔñµÄÆô¶¯(&E)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "´¦Àí SYSTEM.INI ÎÄ¼þ(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "¼ÓÔØÏµÍ³·þÎñ(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "¼ÓÔØÆô¶¯Ïî(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "´¦Àí SYSTEM.INI ÎÄ¼þ(&R)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "¼ÓÔØÏµÍ³·þÎñ(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "¼ÓÔØÆô¶¯Ïî(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175

1 0

[silverblade] 34242: Implemented sound library routines for obtaining Sound Blaster DSP chip version, speaker on/off and DSP 4.xx sample rate configuration. Renamed functions to shorter names. Updated test code in sb16_nt4. DSP version is reported as 4.05 in VirtualBox - which seems to report invalid speaker status... Finally, updated e-mail address.
by silverblade＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: silverblade Date: Tue Jul 1 17:02:54 2008 New Revision: 34242 URL: http://svn.reactos.org/svn/reactos?rev=34242&view=rev Log: Implemented sound library routines for obtaining Sound Blaster DSP chip version, speaker on/off and DSP 4.xx sample rate configuration. Renamed functions to shorter names. Updated test code in sb16_nt4. DSP version is reported as 4.05 in VirtualBox - which seems to report invalid speaker status... Finally, updated e-mail address. Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c branches/silverblade-audio/include/reactos/libs/sound/devname.h branches/silverblade-audio/include/reactos/libs/sound/midi.h branches/silverblade-audio/include/reactos/libs/sound/midiuart.h branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h branches/silverblade-audio/include/reactos/libs/sound/time.h branches/silverblade-audio/lib/drivers/sound/devname.c branches/silverblade-audio/lib/drivers/sound/hardware.c branches/silverblade-audio/lib/drivers/sound/midiuart.c branches/silverblade-audio/lib/drivers/sound/sbdsp.c branches/silverblade-audio/lib/drivers/sound/time.c Modified: branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/drivers/multi… ============================================================================== --- branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] (original) +++ branches/silverblade-audio/drivers/multimedia/audio/sb16_nt4/main.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -4,10 +4,16 @@ NT4 driver model Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 25 May 2008 - Created + + Notes: + ** This driver is currently solely being used to test the sound + library, which actually implements the main body of the driver. This + will eventually be replaced with a proper driver. It assumes a + configuration of base port 0x220, IRQ 5, DMA channel 1 ** */ #include <ntddk.h> @@ -17,6 +23,9 @@ #include <sbdsp.h> #include <devname.h> +#define SB_DEFAULT_TIMEOUT 1000 + + typedef struct _SOUND_BLASTER_EXTENSION { ULONG NothingHereYet; @@ -90,7 +99,8 @@ UnloadSoundBlaster( IN PDRIVER_OBJECT DriverObject) { - INFO_(IHVAUDIO, "Sound Blaster driver being unloaded"); + DbgPrint("Sound Blaster driver being unloaded\n"); + /*INFO_(IHVAUDIO, "Sound Blaster driver being unloaded");*/ } /* This is to be moved into the sound library later */ @@ -145,17 +155,64 @@ ie, this is pretty much as non-PnP as you can get! */ + STDCALL NTSTATUS ThisIsSparta(IN PDRIVER_OBJECT DriverObject) { DEVICE_OBJECT device; - BOOLEAN result; - CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &device); - - INFO_(IHVAUDIO, "Resetting SB..."); - result = ResetSoundBlasterDSP((PUCHAR)0x220, 10000); - INFO_(IHVAUDIO, "SB reset returns %d", result); + NTSTATUS result; + BOOLEAN speaker_state = TRUE; + UCHAR major = 0x69, minor = 0x96; + + /*CreateSoundDeviceWithDefaultName(DriverObject, 0, 69, 0, &device);*/ + + /* 0x220 is the port we expect to work */ + DbgPrint("Resetting Sound Blaster DSP at 0x220\n"); + result = SbDspReset((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); + DbgPrint("Reset was %s\n", + NT_SUCCESS(result) ? "successful" : "unsuccessful"); + + /* 0x240, we don't expect to work */ + DbgPrint("Resetting Sound Blaster DSP at 0x240\n"); + result = SbDspReset((PUCHAR)0x240, SB_DEFAULT_TIMEOUT); + DbgPrint("Reset was %s\n", + NT_SUCCESS(result) ? "successful" : "unsuccessful"); + + /* Try getting version */ + DbgPrint("Retrieving Sound Blaster version...\n"); + result = SbDspGetVersion((PUCHAR)0x220, &major, &minor, SB_DEFAULT_TIMEOUT); + + DbgPrint("Version retrival was %s\n", + NT_SUCCESS(result) ? "successful" : "unsuccessful"); + DbgPrint("Sound Blaster DSP version is %d.%02d\n", major, minor); + + result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); + DbgPrint("Speaker state retrieval %s\n", + NT_SUCCESS(result) ? "succeeded" : "failed"); + + DbgPrint("Speaker state is presently %s\n", + speaker_state ? "ENABLED" : "DISABLED"); + + result = SbDspEnableSpeaker((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); + DbgPrint("Speaker enable request %s\n", + NT_SUCCESS(result) ? "succeeded" : "failed"); + + result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); + DbgPrint("Speaker state retrieval %s\n", + NT_SUCCESS(result) ? "succeeded" : "failed"); + DbgPrint("Speaker state is now %s\n", + speaker_state ? "ENABLED" : "DISABLED"); + + result = SbDspDisableSpeaker((PUCHAR)0x220, SB_DEFAULT_TIMEOUT); + DbgPrint("Speaker disable request %s\n", + NT_SUCCESS(result) ? "succeeded" : "failed"); + + result = SbDspIsSpeakerEnabled((PUCHAR)0x220, &speaker_state, SB_DEFAULT_TIMEOUT); + DbgPrint("Speaker state retrieval %s\n", + NT_SUCCESS(result) ? "succeeded" : "failed"); + DbgPrint("Speaker state is now %s\n", + speaker_state ? "ENABLED" : "DISABLED"); return STATUS_SUCCESS; } @@ -169,7 +226,8 @@ { NTSTATUS status; - INFO_(IHVAUDIO, "Sound Blaster driver (NT4 model) by Silver Blade"); + DbgPrint("Sound Blaster driver (NT4 model) by Silver Blade\n"); + /*INFO_(IHVAUDIO, "Sound Blaster driver (NT4 model) by Silver Blade");*/ DriverObject->Flags = 0; @@ -183,4 +241,3 @@ /* Hax */ return ThisIsSparta(DriverObject); } - Modified: branches/silverblade-audio/include/reactos/libs/sound/devname.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/devname.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/devname.h [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ Device naming & creation helper routines Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 25 May 2008 - Created Modified: branches/silverblade-audio/include/reactos/libs/sound/midi.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/midi.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/midi.h [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ MIDI constants Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 26 May 2008 - Created Modified: branches/silverblade-audio/include/reactos/libs/sound/midiuart.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/midiuart.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/midiuart.h [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ MIDI UART support Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 26 May 2008 - Created Modified: branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/sbdsp.h [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,13 +3,13 @@ Sound Blaster DSP support Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 26 May 2008 - Created Notes: - ... + Where timeouts are concerned, a value of 0 is interpreted as "forever". */ #ifndef ROS_SOUND_SBDSP_H @@ -42,11 +42,13 @@ #define WRITE_SB_DSP_DATA(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) #define WRITE_SB_DSP_COMMAND(bp, x) WRITE_PORT_UCHAR((PUCHAR) bp+0x0C, x) -#define READ_SB_DSP_WRITE_BUFFER_STATUS(bp) \ - ( READ_PORT_UCHAR((PUCHAR) bp+0x0C) & 0x01 ) +/* Clear to send */ +#define SB_DSP_CLEAR_TO_SEND(bp) \ + ( ! (READ_PORT_UCHAR((PUCHAR) bp+0x0C) & 0x80 ) ) -#define READ_SB_DSP_READ_BUFFER_STATUS(bp) \ - ( READ_PORT_UCHAR((PUCHAR) bp+0x0E) & 0x01 ) +/* Data available for reading */ +#define SB_DSP_DATA_AVAILABLE(bp) \ + ( READ_PORT_UCHAR((PUCHAR) bp+0x0E) & 0x80 ) #define SB_DSP_READY 0xAA @@ -65,23 +67,120 @@ /* - Routines + Reset the Sound Blaster DSP. */ -BOOLEAN -ResetSoundBlasterDSP( +NTSTATUS +SbDspReset( IN PUCHAR BasePort, IN ULONG Timeout); -BOOLEAN -WaitForSoundBlasterDSPReady( +/* + Wait for the Sound Blaster DSP to be ready for data to be written to it. +*/ +NTSTATUS +SbDspWaitToWrite( IN PUCHAR BasePort, IN ULONG Timeout); +/* + Wait for data to be ready for reading from the Sound Blaster DSP. +*/ NTSTATUS -GetSoundBlasterDSPVersion( +SbDspWaitToRead( + IN PUCHAR BasePort, + IN ULONG Timeout); + +/* + Wait for the Sound Blaster DSP to be ready for data to be written to it, + then (providing it becomes ready within the timeout period), write the + data to it. +*/ +NTSTATUS +SbDspWrite( + IN PUCHAR BasePort, + IN UCHAR DataByte, + IN ULONG Timeout); + +/* + Wait for the Sound Blaster DSP to be ready for data to be read from it, + then read the data from it into the pointer supplied as DataByte. If + the timeout is exceeded, DataByte will not be modified. +*/ +NTSTATUS +SbDspRead( + IN PUCHAR BasePort, + OUT PUCHAR DataByte, + IN ULONG Timeout); + +/* + This can only be called immediately after a reset has been issued. The + major version and minor version are returned in MajorVersion and + MinorVersion, respectively. + + The timeout applies to each DSP read/write performed. Note that the + data pointed to by MajorVersion may still fail if the retrieval of + MinorVersion times out. +*/ +NTSTATUS +SbDspGetVersion( IN PUCHAR BasePort, OUT PUCHAR MajorVersion, OUT PUCHAR MinorVersion, IN ULONG Timeout); +/* + Turn the speaker on. +*/ +NTSTATUS +SbDspEnableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout); + +/* + Turn the speaker off. +*/ +NTSTATUS +SbDspDisableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout); + +/* + Obtains the speaker status, storing the result in IsEnabled. This will be + TRUE if the speaker is enabled, otherwise FALSE. +*/ +NTSTATUS +SbDspIsSpeakerEnabled( + IN PUCHAR BasePort, + OUT PBOOLEAN IsEnabled, + IN ULONG Timeout); + +/* + Validate the sample rate + * DSP 4.xx only +*/ +BOOLEAN +SbDspIsValidRate( + IN USHORT Rate); + +/* + Set the output/playback rate + * DSP 4.xx only +*/ +NTSTATUS +SbDspSetOutputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout); + +/* + Set the input/record rate + * DSP 4.xx only +*/ +NTSTATUS +SbDspSetInputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout); + + #endif Modified: branches/silverblade-audio/include/reactos/libs/sound/time.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/time.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/time.h [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ Timing helper Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 1 July 2008 - Created Modified: branches/silverblade-audio/lib/drivers/sound/devname.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/devname.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/devname.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ Device naming & creation helper routines Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 25 May 2008 - Created @@ -12,6 +12,7 @@ #include <ntddk.h> #include <ntddsnd.h> #include <debug.h> + /* Default device names @@ -81,14 +82,14 @@ /* Check for NULL parameters */ if ( ( ! Path ) || ( ! DeviceName ) ) { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); + DPRINT("Unexpected NULL parameter"); return STATUS_INVALID_PARAMETER; } /* Range-check */ if ( Index >= SOUND_MAX_DEVICES ) { - ERR_(IHVAUDIO, "Device index %d out of range", Index); + DPRINT("Device index %d out of range", Index); return STATUS_INVALID_PARAMETER; } @@ -106,7 +107,7 @@ if ( ! DeviceName->Buffer ) { - ERR_(IHVAUDIO, "Couldn't allocate memory for device name string"); + DPRINT("Couldn't allocate memory for device name string"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -171,7 +172,7 @@ if ( DeviceType > MAX_DEVICE_TYPE ) { - ERR_(IHVAUDIO, "Invalid device type"); + DPRINT("Invalid device type"); return STATUS_INVALID_PARAMETER; } @@ -206,14 +207,14 @@ if ( ( ! DeviceNameBody ) || ( ! DosDeviceNameBody ) || ( ! FullDeviceName ) || ( ! FullDosDeviceName ) ) { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); + DPRINT("Unexpected NULL parameter"); return STATUS_INVALID_PARAMETER; } /* Range-check */ if ( Index >= SOUND_MAX_DEVICES ) { - ERR_(IHVAUDIO, "Device %d exceeds maximum", Index); + DPRINT("Device %d exceeds maximum", Index); return STATUS_INVALID_PARAMETER; } @@ -264,14 +265,14 @@ if ( ( ! DriverObject ) || ( ! DeviceObject ) || ( ! WideDeviceName ) || ( ! WideDosDeviceName ) ) { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); + DPRINT("Unexpected NULL parameter"); return STATUS_INVALID_PARAMETER; } /* Range-check */ if ( Index >= SOUND_MAX_DEVICES ) { - ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); + DPRINT("Device index %d exceeds maximum", Index); return STATUS_INVALID_PARAMETER; } @@ -345,14 +346,14 @@ /* Check for NULL parameters */ if ( ( ! DriverObject ) || ( ! DeviceObject ) ) { - ERR_(IHVAUDIO, "Unexpected NULL parameter"); + DPRINT("Unexpected NULL parameter"); return STATUS_INVALID_PARAMETER; } /* Range-check */ if ( Index >= SOUND_MAX_DEVICES ) { - ERR_(IHVAUDIO, "Device index %d exceeds maximum", Index); + DPRINT("Device index %d exceeds maximum", Index); return STATUS_INVALID_PARAMETER; } Modified: branches/silverblade-audio/lib/drivers/sound/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/hardware.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/hardware.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ Hardware interaction helper Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 25 May 2008 - Created @@ -33,7 +33,7 @@ KIRQL IrqLevel; KAFFINITY Affinity; - INFO_(IHVAUDIO, "Obtaining interrupt vector"); + DPRINT("Obtaining interrupt vector"); Vector = HalGetInterruptVector(Isa, 0, @@ -42,8 +42,8 @@ &IrqLevel, &Affinity); - INFO_(IHVAUDIO, "Vector %d", Vector); - INFO_(IHVAUDIO, "Connecting IRQ %d", Irq); + DPRINT("Vector %d", Vector); + DPRINT("Connecting IRQ %d", Irq); Status = IoConnectInterrupt(InterruptObject, ServiceRoutine, Modified: branches/silverblade-audio/lib/drivers/sound/midiuart.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/midiuart.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/midiuart.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,7 +3,7 @@ MIDI UART support Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 26 May 2008 - Created @@ -91,82 +91,3 @@ return TRUE; } - - -/* Experimental OO-style stuff */ -/* -typedef struct _MIDIUART -{ - PUCHAR BasePort; - ULONG Timeout; -} MIDIUART, *PMIDIUART; - -NTSTATUS -MidiUart_Create( - IN PUCHAR BasePort, - IN ULONG Timeout, - OUT PMIDIUART* MidiUart) -{ - PMIDIUART NewMidiUart; - - if ( ! MidiUart ) - return STATUS_INVALID_PARAMETER; - - NewMidiUart = ExAllocatePoolWithTag(sizeof(MIDIUART), PAGED_POOL, 'MIDU'); - - if ( ! NewMidiUart ) - return STATUS_INSUFFICIENT_RESOURCES; - - NewMidiUart->BasePort = BasePort; - NewMidiUart->Timeout = Timeout; - - *MidiUart = NewMidiUart; - - return STATUS_SUCCESS; -} - -BOOLEAN -MidiUart_WaitForStatus( - IN PMIDIUART MidiUart, - IN UCHAR StatusFlags) -{ - if ( ! MidiUart) - return FALSE; - - return WaitForMidiUartStatus(MidiUart->BasePort, - StatusFlags, - MidiUart->Timeout); -} - -#define MidiUart_WaitForCTS(inst) \ - MidiUart_WaitForStatus(inst, MIDIUART_STATUS_CTS) - -#define MidiUart_WaitForDTR(inst) \ - MidiUart_WaitForStatus(inst, MIDIUART_STATUS_DTR) - -BOOLEAN -MidiUart_WriteByte( - IN PMIDIUART MidiUart, - IN UCHAR Data) -{ - if ( ! MidiUart ) - return FALSE; - - return WriteMidiUartByte(MidiUart->BasePort, - Data, - MidiUart->Timeout); -} - -BOOLEAN -MidiUart_ReadByte( - IN PMIDIUART MidiUart, - OUT PUCHAR Data) -{ - if ( ! MidiUart ) - return FALSE; - - return ReadMidiUartByte(MidiUart->BasePort, - Data, - MidiUart->Timeout); -} -*/ Modified: branches/silverblade-audio/lib/drivers/sound/sbdsp.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/sbdsp.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,33 +3,32 @@ Sound Blaster DSP support Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 26 May 2008 - Created Notes: - ... + Functions documented in sbdsp.h */ #include <ntddk.h> +#include <debug.h> #include <time.h> #include <sbdsp.h> -BOOLEAN -ResetSoundBlasterDSP( +NTSTATUS +SbDspReset( IN PUCHAR BasePort, IN ULONG Timeout) { ULONG Expiry; - KTIMER Timer; KIRQL CurrentIrqLevel = KeGetCurrentIrql(); + BOOLEAN DataAvailable = FALSE; /* Should be called from DriverEntry with this IRQL */ ASSERT(CurrentIrqLevel == PASSIVE_LEVEL); - - KeInitializeTimer(&Timer); WRITE_SB_DSP_RESET(BasePort, 0x01); SleepMs(50); /* Should be enough */ @@ -37,19 +36,35 @@ Expiry = QuerySystemTimeMs() + Timeout; + /* Wait for data to be available */ while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) { + if ( SB_DSP_DATA_AVAILABLE(BasePort) ) + { + DataAvailable = TRUE; + break; + } + } + + if ( ! DataAvailable ) + { + return STATUS_TIMEOUT; + } + + /* Data is available - wait for the "DSP ready" code */ + while ( (QuerySystemTimeMs() < Expiry) || ( Timeout == 0) ) + { if ( READ_SB_DSP_DATA(BasePort) == SB_DSP_READY ) { - return TRUE; - } - } - - return FALSE; -} - -BOOLEAN -WaitForSoundBlasterDSPReady( + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWaitToWrite( IN PUCHAR BasePort, IN ULONG Timeout) { @@ -57,19 +72,228 @@ while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) { - // ... - } - - return FALSE; -} - -NTSTATUS -GetSoundBlasterDSPVersion( + if ( SB_DSP_CLEAR_TO_SEND(BasePort) ) + { + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWaitToRead( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + ULONG Expiry = QuerySystemTimeMs() + Timeout; + + while ( (QuerySystemTimeMs() < Expiry) || (Timeout == 0) ) + { + if ( SB_DSP_DATA_AVAILABLE(BasePort) ) + { + return STATUS_SUCCESS; + } + } + + return STATUS_TIMEOUT; +} + +NTSTATUS +SbDspWrite( + IN PUCHAR BasePort, + IN UCHAR DataByte, + IN ULONG Timeout) +{ + NTSTATUS Status; + + Status = SbDspWaitToWrite(BasePort, Timeout); + + if ( ! NT_SUCCESS(Status) ) + { + return Status; + } + + DbgPrint("SBDSP - Writing %02x\n", DataByte); + WRITE_SB_DSP_DATA(BasePort, DataByte); + + return STATUS_SUCCESS; +} + +NTSTATUS +SbDspRead( + IN PUCHAR BasePort, + OUT PUCHAR DataByte, + IN ULONG Timeout) +{ + NTSTATUS Status; + + if ( ! DataByte ) + { + return STATUS_INVALID_PARAMETER_2; + } + + Status = SbDspWaitToRead(BasePort, Timeout); + + if ( ! NT_SUCCESS(Status) ) + { + return Status; + } + + *DataByte = READ_SB_DSP_DATA(BasePort); + DbgPrint("SBDSP - Read %02x\n", *DataByte); + + return STATUS_SUCCESS; +} + +NTSTATUS +SbDspGetVersion( IN PUCHAR BasePort, OUT PUCHAR MajorVersion, OUT PUCHAR MinorVersion, IN ULONG Timeout) { - /* TODO */ - return STATUS_NOT_SUPPORTED; -} + NTSTATUS Status; + + /* Make sure our parameters are sane */ + if ( ! MajorVersion ) + return STATUS_INVALID_PARAMETER_2; + + if ( ! MinorVersion ) + return STATUS_INVALID_PARAMETER_3; + + /* Send version request */ + Status = SbDspWrite(BasePort, SB_DSP_VERSION, Timeout); + if ( ! NT_SUCCESS(Status) ) + return Status; + + /* Get the major version */ + Status = SbDspRead(BasePort, MajorVersion, Timeout); + if ( ! NT_SUCCESS(Status) ) + return FALSE; + + /* Get the minor version */ + Status = SbDspRead(BasePort, MinorVersion, Timeout); + return Status; +} + +NTSTATUS +SbDspEnableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + return SbDspWrite(BasePort, SB_DSP_SPEAKER_ON, Timeout); +} + +NTSTATUS +SbDspDisableSpeaker( + IN PUCHAR BasePort, + IN ULONG Timeout) +{ + return SbDspWrite(BasePort, SB_DSP_SPEAKER_OFF, Timeout); +} + +/* + BUG? + It seems under VirtualBox this returns 0x05, irrespective + of the speaker state. I'm not sure if this will also occur + on real hardware. +*/ +NTSTATUS +SbDspIsSpeakerEnabled( + IN PUCHAR BasePort, + OUT PBOOLEAN IsEnabled, + IN ULONG Timeout) +{ + NTSTATUS Status; + UCHAR SpeakerStatus = 0; + + if ( ! IsEnabled ) + return STATUS_INVALID_PARAMETER_2; + + /* Request the speaker status */ + Status = SbDspWrite(BasePort, SB_DSP_SPEAKER_STATUS, Timeout); + if ( ! NT_SUCCESS(Status) ) + return Status; + + /* Obtain the status */ + Status = SbDspRead(BasePort, &SpeakerStatus, Timeout); + if ( ! NT_SUCCESS(Status) ) + return Status; + + DbgPrint("SBDSP - SpeakerStatus is %02x\n", SpeakerStatus); + *IsEnabled = (SpeakerStatus == 0xFF); + + return STATUS_SUCCESS; +} + +BOOLEAN +SbDspIsValidRate( + IN USHORT Rate) +{ + /* Not sure if this range is 100% correct */ + return ( ( Rate >= 5000 ) && ( Rate <= 45000 ) ); +} + +/* Internal routine - call only after submitting one of the rate commands */ +NTSTATUS +SbDspWriteRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + if ( ! SbDspIsValidRate(Rate) ) + return STATUS_INVALID_PARAMETER_2; + + /* Write high byte */ + Status = SbDspWrite(BasePort, (Rate & 0xff00) >> 8, Timeout); + if ( ! NT_SUCCESS(Status) ) + return Status; + + /* Write low byte */ + Status = SbDspWrite(BasePort, Rate & 0xff, Timeout); + if ( ! NT_SUCCESS(Status) ) + return Status; + + return Status; +} + +NTSTATUS +SbDspSetOutputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + if ( ! SbDspIsValidRate(Rate) ) + return STATUS_INVALID_PARAMETER_2; + + /* Prepare to write the output rate */ + Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); + if ( ! NT_SUCCESS(Status) ) + return Status; + + return SbDspWriteRate(BasePort, Rate, Timeout); +} + +NTSTATUS +SbDspSetInputRate( + IN PUCHAR BasePort, + IN USHORT Rate, + IN ULONG Timeout) +{ + NTSTATUS Status; + + if ( ! SbDspIsValidRate(Rate) ) + return STATUS_INVALID_PARAMETER_2; + + /* Prepare to write the input rate */ + Status = SbDspWrite(BasePort, SB_DSP_OUTPUT_RATE, (Rate & 0xff00) >> 8); + if ( ! NT_SUCCESS(Status) ) + return Status; + + return SbDspWriteRate(BasePort, Rate, Timeout); +} Modified: branches/silverblade-audio/lib/drivers/sound/time.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/time.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/time.c [iso-8859-1] Tue Jul 1 17:02:54 2008 @@ -3,13 +3,15 @@ Timing helper Author: - Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) + Andrew Greenwood (silverblade(a)reactos.org) History: 31 May 2008 - Created Notes: - Timing may require testing! + Have checked timing in DebugView. A 10,000ms delay covered a period + of 124.305 sec to 134.308 sec. Not 100% accurate but likely down to + the delays in submitting the debug strings? */ /*

1 0

[janderwald] 34241: - check the checkboxes of the services which have the running state - bug 1986
by janderwald＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: janderwald Date: Tue Jul 1 17:01:13 2008 New Revision: 34241 URL: http://svn.reactos.org/svn/reactos?rev=34241&view=rev Log: - check the checkboxes of the services which have the running state - bug 1986 Modified: trunk/reactos/base/applications/msconfig/srvpage.c Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] Tue Jul 1 17:01:13 2008 @@ -135,6 +135,11 @@ item.lParam = 0; item.iItem = ListView_InsertItem(hServicesListCtrl, &item); + if (pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + ListView_SetCheckState(hServicesListCtrl, item.iItem, TRUE); + } + BytesNeeded = 0; hService = OpenService(ScHandle, pServiceStatus[Index].lpServiceName, SC_MANAGER_CONNECT); if (hService != INVALID_HANDLE_VALUE)

1 0

[mkupfer] 34240: Paolo Devoti <devotip AT tiscali DOT it> - Italian translation patch for usetup, regedit and shell32 - See issue #3435 for more details.
by mkupfer＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: mkupfer Date: Tue Jul 1 14:25:12 2008 New Revision: 34240 URL: http://svn.reactos.org/svn/reactos?rev=34240&view=rev Log: Paolo Devoti <devotip AT tiscali DOT it> - Italian translation patch for usetup, regedit and shell32 - See issue #3435 for more details. Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Tue Jul 1 14:25:12 2008 @@ -268,7 +268,7 @@ ID_EDIT_NEW_KEY "Aggiunge una nuova chiave" ID_EDIT_NEW_STRINGVALUE "Aggiunge un nuovo valore stringa" ID_EDIT_NEW_BINARYVALUE "Aggiunge un nuovo valore binario" - ID_EDIT_NEW_DWORDVALUE "Aggiunge un nuovo valore a doppia parola" + ID_EDIT_NEW_DWORDVALUE "Aggiunge un nuovo valore DWORD" ID_REGISTRY_IMPORTREGISTRYFILE "Importa un file di testo nel Registro" ID_REGISTRY_EXPORTREGISTRYFILE "Esporta tutto o parte del Registro in un file di testo" @@ -314,7 +314,7 @@ IDS_ERR_DELVAL_CAPTION "Errore nella cancellazione dei valori" IDS_ERR_DELETEVALUE "Impossibile cancellare tutti i valori indicati!" IDS_ERR_RENVAL_CAPTION "Errore nel rinominare il valore" - IDS_ERR_RENVAL_TOEMPTY "Impossibile rinominare %s. Il nome indicato è vuoto. Riprovate con un altro nome." + IDS_ERR_RENVAL_TOEMPTY "Impossibile rinominare %s. Il nome indicato è vuoto. Riprovate con un altro nome." IDS_NEW_KEY "Nuova chiave #%d" IDS_NEW_VALUE "Nuovo valore #%d" END Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Tue Jul 1 14:25:12 2008 @@ -424,7 +424,7 @@ { 6, 24, - "\"Confermare la configurazione delle periferiche\" e premere INVIO.", + "\"Procedere con questa configurazione\" e premere INVIO.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Jul 1 14:25:12 2008 @@ -423,10 +423,10 @@ LTEXT "Questa cartella contiene un file a solo lettura con nome '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX LTEXT "Questa cartella contiene un file di sistema con nome '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX LTEXT "Volete sostituire il file esistente", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "(data e dimensione sconosciuti)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL LTEXT "con questo?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "(data e dimensione sconosciuti)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END @@ -619,7 +619,7 @@ IDS_FAVORITES "Preferiti" IDS_STARTUP "Menu Avvio\\Programmi\\AvvioAutomatico" IDS_RECENT "Recenti" - IDS_SENDTO "InviaA" + IDS_SENDTO "Invia A" IDS_STARTMENU "Menu Avvio" IDS_MYMUSIC "Musica" IDS_MYVIDEO "Video" @@ -660,7 +660,7 @@ IDS_FOLDER_OPTIONS "Opzioni della cartella" IDS_RECYCLEBIN_LOCATION "Posizione del Cestino" IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile" - IDS_EMPTY_BITBUCKET "Empty Recycle Bin" + IDS_EMPTY_BITBUCKET "Svuota cestino" IDS_PICK_ICON_TITLE "Scegliere un icona" IDS_PICK_ICON_FILTER "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" IDS_OPEN_WITH_FILTER "File eseguibili\0*.exe\0"

1 0

[pschweitzer] 34239: Partly merged r34238
by pschweitzer＠svn.reactos.org 01 Jul '08

01 Jul '08

Author: pschweitzer Date: Tue Jul 1 14:05:42 2008 New Revision: 34239 URL: http://svn.reactos.org/svn/reactos?rev=34239&view=rev Log: Partly merged r34238 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Tue Jul 1 14:05:42 2008 @@ -249,7 +249,7 @@ TRUE); if (!NT_SUCCESS(Status)) { - ExFreePool (MftRecord); + ExFreePool(MftRecord); return Status; } @@ -265,7 +265,7 @@ Status = ReadFileRecord(DeviceExt, 3, VolumeRecord, MftRecord); if (!NT_SUCCESS(Status)) { - ExFreePool (MftRecord); + ExFreePool(MftRecord); return Status; } @@ -307,7 +307,8 @@ NtfsInfo->Flags = VolumeInfo->Flags; } - ExFreePool (MftRecord); + ExFreePool(MftRecord); + ExFreePool(VolumeRecord); return Status; } @@ -354,7 +355,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; - NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; + NewDeviceObject->Flags |= DO_DIRECT_IO; Vcb = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(Vcb, sizeof(NTFS_VCB));

1 0

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 July 2008