Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[jimtabor] 20603: Implement NtUserGetMenuBarInfo. Tested with MPlayerC with OBJID_MENU only, the rest looked easy enough.
by jimtabor＠svn.reactos.org 06 Jan '06

06 Jan '06

Implement NtUserGetMenuBarInfo. Tested with MPlayerC with OBJID_MENU only, the rest looked easy enough. Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 05:27:48 UTC (rev 20602) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 06:32:05 UTC (rev 20603) @@ -1636,7 +1636,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL NtUserGetMenuBarInfo( @@ -1645,29 +1645,209 @@ LONG idItem, PMENUBARINFO pmbi) { - UNIMPLEMENTED + BOOL Res = TRUE; + PMENU_OBJECT MenuObject; + PMENU_ITEM mi; + PWINDOW_OBJECT WindowObject; + HMENU hMenu; + POINT Offset; + RECT Rect; + MENUBARINFO kmbi; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetMenuBarInfo\n"); + UserEnterShared(); + + if (!(WindowObject = UserGetWindowObject(hwnd))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + RETURN(FALSE); + } + hMenu = (HMENU)WindowObject->IDMenu; + + if (!(MenuObject = UserGetMenuObject(hMenu))) + { + SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); + RETURN(FALSE); + } + + if (pmbi->cbSize != sizeof(MENUBARINFO)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + kmbi.cbSize = sizeof(MENUBARINFO); + kmbi.fBarFocused = FALSE; + kmbi.fFocused = FALSE; + kmbi.hwndMenu = NULL; + switch (idObject) { - case OBJID_CLIENT: + case OBJID_MENU: { - DPRINT1("OBJID_CLIENT, idItem = %d\n",idItem); + PMENU_OBJECT SubMenuObject; + kmbi.hMenu = hMenu; + if (idItem) /* Non-Zero-Based. */ + { + if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + /* If items is zero we assume info for the menu itself. */ + if (!(IntGetClientOrigin(WindowObject, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + MenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + MenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + DPRINT("Rect top = %d bottom = %d left = %d right = %d \n", + Rect.top, Rect.bottom, Rect.left, Rect.right); + } + if (idItem) + { + if (idItem-1 == MenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (MenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_MENU, idItem = %d\n",idItem); break; } - case OBJID_MENU: + case OBJID_CLIENT: { - DPRINT1("OBJID_MENU, idItem = %d\n",idItem); + PMENU_OBJECT SubMenuObject, XSubMenuObject; + SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hMenu = SubMenuObject->MenuInfo.Self; + else + { + Res = FALSE; + DPRINT1("OBJID_CLIENT, No SubMenu!\n"); + break; + } + if (idItem) + { + if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + PWINDOW_OBJECT SubWinObj; + if (!(SubWinObj = UserGetWindowObject(SubMenuObject->MenuInfo.Wnd))) + { + Res = FALSE; + break; + } + if (!(IntGetClientOrigin(SubWinObj, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + SubMenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + SubMenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + } + if (idItem) + { + if (idItem-1 == SubMenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (SubMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + XSubMenuObject = UserGetMenuObject(SubMenuObject->MenuItemList->hSubMenu); + if (XSubMenuObject) kmbi.hwndMenu = XSubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_CLIENT, idItem = %d\n",idItem); break; } case OBJID_SYSMENU: { - DPRINT1("OBJID_SYSMENU, idItem = %d\n",idItem); + PMENU_OBJECT SysMenuObject, SubMenuObject; + if(!(SysMenuObject = IntGetSystemMenu(WindowObject, FALSE, FALSE))) + { + Res = FALSE; + break; + } + kmbi.hMenu = SysMenuObject->MenuInfo.Self; + if (idItem) + { + if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + PWINDOW_OBJECT SysWinObj; + if (!(SysWinObj = UserGetWindowObject(SysMenuObject->MenuInfo.Wnd))) + { + Res = FALSE; + break; + } + if (!(IntGetClientOrigin(SysWinObj, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + SysMenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + SysMenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + } + if (idItem) + { + if (idItem-1 == SysMenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (SysMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + SubMenuObject = UserGetMenuObject(SysMenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_SYSMENU, idItem = %d\n",idItem); break; } default: + Res = FALSE; DPRINT1("Unknown idObject = %d, idItem = %d\n",idObject,idItem); } - return 0; + if (Res) + { + NTSTATUS Status = MmCopyToCaller(pmbi, &kmbi, sizeof(MENUBARINFO)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(FALSE); + } + } + RETURN(Res); + +CLEANUP: + DPRINT("Leave NtUserGetMenuBarInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; }

1 0

[greatlrd] 20602: fixed working strechblt for all dibxx now. do not say it does not take offset of source and destantion into accunt, it does. left implement CliprRegion. but last no longer black windows with or corupt images showing.
by greatlrd＠svn.reactos.org 06 Jan '06

06 Jan '06

fixed working strechblt for all dibxx now. do not say it does not take offset of source and destantion into accunt, it does. left implement CliprRegion. but last no longer black windows with or corupt images showing. Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-06 02:25:12 UTC (rev 20601) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-06 05:27:48 UTC (rev 20602) @@ -502,793 +502,130 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; - int zoomX; - int zoomY; - int count; - int saveX = 0; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; - - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; - DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; + + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + } - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; + break; - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - - - switch(SourceSurf->iBitmapFormat) - { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - - } - } - } - } - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - else - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); - - } - } - } - } - break; - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_8BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_16BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_32BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - default: - //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + //DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-06 02:25:12 UTC (rev 20601) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-06 05:27:48 UTC (rev 20602) @@ -497,797 +497,134 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; - int zoomX; - int zoomY; - int count; - int saveX; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; - - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; + + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + else + { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; + break; - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - - switch(SourceSurf->iBitmapFormat) - { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else [truncated at 1000 lines; 1773 more skipped]

1 0

[ion] 20601: - Fix some bugs in Kernel Queue implementation:
by ion＠svn.reactos.org 06 Jan '06

06 Jan '06

- Fix some bugs in Kernel Queue implementation: * KeRemoveQueue did not set Thread->WaitNext = FALSE if it was called with WaitNext = TRUE. * KeRemoveQueue did not handle the case where a kernel-mode APC is pending and the previous IRQL was below APC_LEVEL. * KeRemoveQueue did not set the thread's wait status to 0. * KiInsertQueue did not set the Thread's wait status to the entry being inserted. * KiInsertQueue did not remove the thread from its wait list. * KeRemoveQueue did not properly link the wait blocks. Modified: trunk/reactos/ntoskrnl/ke/queue.c _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 00:01:20 UTC (rev 20600) +++ trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 02:25:12 UTC (rev 20601) @@ -117,25 +117,23 @@ IN KPROCESSOR_MODE WaitMode, IN PLARGE_INTEGER Timeout OPTIONAL) { - - PLIST_ENTRY ListEntry; + PLIST_ENTRY QueueEntry; NTSTATUS Status; PKTHREAD Thread = KeGetCurrentThread(); KIRQL OldIrql; PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK TimerWaitBlock; PKTIMER Timer; - DPRINT("KeRemoveQueue %x\n", Queue); /* Check if the Lock is already held */ - if (Thread->WaitNext) { - + if (Thread->WaitNext) + { DPRINT("Lock is already held\n"); - - } else { - + Thread->WaitNext = FALSE; + } + else + { /* Lock the Dispatcher Database */ DPRINT("Lock not held, acquiring\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -147,49 +145,43 @@ Thread->Queue = Queue; /* Check if this is a different queue */ - if (Queue != PreviousQueue) { - - /* - * INVESTIGATE: What is the Thread->QueueListEntry used for? It's linked it into the - * Queue->ThreadListHead when the thread registers with the queue and unlinked when - * the thread registers with a new queue. The Thread->Queue already tells us what - * queue the thread is registered with. - * -Gunnar - */ + if (Queue != PreviousQueue) + { DPRINT("Different Queue\n"); - if (PreviousQueue) { - + QueueEntry = &Thread->QueueListEntry; + if (PreviousQueue) + { /* Remove from this list */ DPRINT("Removing Old Queue\n"); - RemoveEntryList(&Thread->QueueListEntry); + RemoveEntryList(QueueEntry); /* Wake the queue */ DPRINT("Activating new thread\n"); KiWakeQueue(PreviousQueue); - } + } /* Insert in this new Queue */ DPRINT("Inserting new Queue!\n"); - InsertTailList(&Queue->ThreadListHead, &Thread->QueueListEntry); - - } else { - + InsertTailList(&Queue->ThreadListHead, QueueEntry); + } + else + { /* Same queue, decrement waiting threads */ DPRINT("Same Queue!\n"); Queue->CurrentCount--; } /* Loop until the queue is processed */ - while (TRUE) { - + while (TRUE) + { /* Check if the counts are valid and if there is still a queued entry */ + QueueEntry = Queue->EntryListHead.Flink; if ((Queue->CurrentCount < Queue->MaximumCount) && - !IsListEmpty(&Queue->EntryListHead)) { - + (QueueEntry != &Queue->EntryListHead)) + { /* Remove the Entry and Save it */ DPRINT("Removing Queue Entry. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); - ListEntry = Queue->EntryListHead.Flink; /* Decrease the number of entries */ Queue->Header.SignalState--; @@ -198,20 +190,20 @@ Queue->CurrentCount++; /* Check if the entry is valid. If not, bugcheck */ - if (!ListEntry->Flink || !ListEntry->Blink) { - + if (!(QueueEntry->Flink) || !(QueueEntry->Blink)) + { KEBUGCHECK(INVALID_WORK_QUEUE_ITEM); } /* Remove the Entry */ - RemoveEntryList(ListEntry); - ListEntry->Flink = NULL; + RemoveEntryList(QueueEntry); + QueueEntry->Flink = NULL; /* Nothing to wait on */ break; - - } else { - + } + else + { /* Do the wait */ DPRINT("Waiting on Queue Entry. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); @@ -219,11 +211,21 @@ /* Use the Thread's Wait Block, it's big enough */ Thread->WaitBlockList = &Thread->WaitBlock[0]; - /* Fail if there's an APC Pending */ - if (WaitMode != KernelMode && Thread->ApcState.UserApcPending) { + /* Check if a kernel APC is pending and we were below APC_LEVEL */ + if ((Thread->ApcState.KernelApcPending) && + (Thread->WaitIrql < APC_LEVEL)) + { + /* Increment the count and unlock the dispatcher */ + Queue->CurrentCount++; + KeReleaseDispatcherDatabaseLock(Thread->WaitIrql); + goto SkipWait; + } + /* Fail if there's a User APC Pending */ + if ((WaitMode != KernelMode) && (Thread->ApcState.UserApcPending)) + { /* Return the status and increase the pending threads */ - ListEntry = (PLIST_ENTRY)STATUS_USER_APC; + QueueEntry = (PLIST_ENTRY)STATUS_USER_APC; Queue->CurrentCount++; /* Nothing to wait on */ @@ -236,19 +238,17 @@ WaitBlock->WaitKey = STATUS_SUCCESS; WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; - WaitBlock->NextWaitBlock = WaitBlock; + Thread->WaitStatus = STATUS_WAIT_0; - Thread->WaitStatus = STATUS_SUCCESS; - /* We need to wait for the object... check if we have a timeout */ - if (Timeout) { - + if (Timeout) + { /* If it's zero, then don't do any waiting */ - if (!Timeout->QuadPart) { - + if (!Timeout->QuadPart) + { /* Instant Timeout, return the status and increase the pending threads */ DPRINT("Queue Wait has timed out\n"); - ListEntry = (PLIST_ENTRY)STATUS_TIMEOUT; + QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; Queue->CurrentCount++; /* Nothing to wait on */ @@ -260,27 +260,31 @@ * hold on to the dispatcher lock. */ Timer = &Thread->Timer; - TimerWaitBlock = &Thread->WaitBlock[1]; + WaitBlock->NextWaitBlock = &Thread->WaitBlock[1]; + WaitBlock = &Thread->WaitBlock[1]; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)Timer; - TimerWaitBlock->Thread = Thread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = TimerWaitBlock; + WaitBlock->Object = (PVOID)Timer; + WaitBlock->Thread = Thread; + WaitBlock->WaitKey = STATUS_TIMEOUT; + WaitBlock->WaitType = WaitAny; /* Link the timer to this Wait Block */ InitializeListHead(&Timer->Header.WaitListHead); - InsertTailList(&Timer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); + InsertTailList(&Timer->Header.WaitListHead, &WaitBlock->WaitListEntry); /* Create Timer */ DPRINT("Creating Timer with timeout %I64d\n", *Timeout); KiInsertTimer(Timer, *Timeout); } + /* Close the loop */ + WaitBlock->NextWaitBlock = &Thread->WaitBlock[0]; + /* Insert the wait block into the Queues's wait list */ - WaitBlock = Thread->WaitBlockList; - InsertTailList(&Queue->Header.WaitListHead, &WaitBlock->WaitListEntry); + WaitBlock = &Thread->WaitBlock[0]; + InsertTailList(&Queue->Header.WaitListHead, + &WaitBlock->WaitListEntry); /* Block the Thread */ DPRINT("Blocking the Thread: %x %x!\n", KeGetCurrentThread(), Thread); @@ -293,14 +297,21 @@ Thread->WaitReason = 0; /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) { - + if (Status != STATUS_KERNEL_APC) + { /* Done Waiting */ DPRINT("Done waking queue. Thread: %x %x!\n", KeGetCurrentThread(), Thread); return (PLIST_ENTRY)Status; } + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + /* Acquire again the lock */ +SkipWait: DPRINT("Looping again\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -314,7 +325,7 @@ KeReleaseDispatcherDatabaseLock(Thread->WaitIrql); DPRINT("Returning. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); - return ListEntry; + return QueueEntry; } /* @@ -335,15 +346,15 @@ OldIrql = KeAcquireDispatcherDatabaseLock(); /* Make sure the list is not empty */ - if (!IsListEmpty(&Queue->EntryListHead)) + if (!IsListEmpty(&Queue->EntryListHead)) { /* Remove it */ FirstEntry = RemoveHeadList(&Queue->EntryListHead); } /* Unlink threads and clear their Thread->Queue */ - while (!IsListEmpty(&Queue->ThreadListHead)) { - + while (!IsListEmpty(&Queue->ThreadListHead)) + { /* Get the Entry and Remove it */ EnumEntry = RemoveHeadList(&Queue->ThreadListHead); @@ -369,25 +380,26 @@ PLIST_ENTRY QueueEntry; PLIST_ENTRY WaitEntry; PKWAIT_BLOCK WaitBlock; + PKTHREAD Thread; /* Decrement the number of active threads */ DPRINT("KiWakeQueue: %x. Thread: %x\n", Queue, KeGetCurrentThread()); Queue->CurrentCount--; /* Make sure the counts are OK */ - if (Queue->CurrentCount < Queue->MaximumCount) { - + if (Queue->CurrentCount < Queue->MaximumCount) + { /* Get the Queue Entry */ QueueEntry = Queue->EntryListHead.Flink; /* Get the Wait Entry */ WaitEntry = Queue->Header.WaitListHead.Blink; - DPRINT("Queue Count is ok, Queue entries: %x, %x\n", QueueEntry, WaitEntry); + DPRINT("Queue Count is ok; entries: %p, %p\n", QueueEntry, WaitEntry); - /* Make sure that the Queue List isn't empty and that this entry is valid */ - if (!IsListEmpty(&Queue->Header.WaitListHead) && - (QueueEntry != &Queue->EntryListHead)) { - + /* Make sure that the Queue entries are not part of empty lists */ + if ((WaitEntry != &Queue->Header.WaitListHead) && + (QueueEntry != &Queue->EntryListHead)) + { /* Remove this entry */ DPRINT("Queue in List, removing it\n"); RemoveEntryList(QueueEntry); @@ -397,9 +409,12 @@ Queue->Header.SignalState--; /* Unwait the Thread */ - DPRINT("Unwaiting Thread\n"); - WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); - KiAbortWaitThread(WaitBlock->Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); + WaitBlock = CONTAINING_RECORD(WaitEntry, + KWAIT_BLOCK, + WaitListEntry); + Thread = WaitBlock->Thread; + DPRINT1("Unwaiting Thread: %d\n", Thread->State); + KiAbortWaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); } } } @@ -417,7 +432,6 @@ PKTHREAD Thread = KeGetCurrentThread(); PKWAIT_BLOCK WaitBlock; PLIST_ENTRY WaitEntry; - DPRINT("KiInsertQueue(Queue %x, Entry %x)\n", Queue, Entry); /* Save the old state */ @@ -434,8 +448,8 @@ */ if ((Queue->CurrentCount < Queue->MaximumCount) && (WaitEntry != &Queue->Header.WaitListHead) && - ((Thread->Queue != Queue) || (Thread->WaitReason != WrQueue))) { - + ((Thread->Queue != Queue) || (Thread->WaitReason != WrQueue))) + { /* Remove the wait entry */ DPRINT("Removing Entry\n"); RemoveEntryList(WaitEntry); @@ -448,12 +462,16 @@ /* Reset the wait reason */ Thread->WaitReason = 0; - /* Increase the waiting threads */ + /* Increase the active threads and set the status*/ Queue->CurrentCount++; + Thread->WaitStatus = (NTSTATUS)Entry; + /* Remove the thread from its wait list */ + RemoveEntryList(&Thread->WaitListEntry); + /* Check if there's a Thread Timer */ - if (Thread->Timer.Header.Inserted) { - + if (Thread->Timer.Header.Inserted) + { /* Cancel the Thread Timer with the no-lock fastpath */ DPRINT("Removing the Thread's Timer\n"); Thread->Timer.Header.Inserted = FALSE; @@ -463,19 +481,22 @@ /* Reschedule the Thread */ DPRINT("Unblocking the Thread\n"); KiUnblockThread(Thread, (PNTSTATUS)&Entry, 0); - - } else { - + } + else + { /* Increase the Entries */ DPRINT("Adding new Queue Entry: %d %d\n", Head, Queue->Header.SignalState); Queue->Header.SignalState++; - if (Head) { - + /* Check which mode we're using */ + if (Head) + { + /* Insert in the head */ InsertHeadList(&Queue->EntryListHead, Entry); - - } else { - + } + else + { + /* Insert at the end */ InsertTailList(&Queue->EntryListHead, Entry); } }

1 0

[gedmurphy] 20600: New icon. Couple of code changes linked to that. Just playing :)
by gedmurphy＠svn.reactos.org 06 Jan '06

06 Jan '06

New icon. Couple of code changes linked to that. Just playing :) Deleted: trunk/reactos/subsys/system/servman/res/applet.ico Added: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Deleted: trunk/reactos/subsys/system/servman/res/applet.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/system.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-05 23:43:49 UTC (rev 20599) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-06 00:01:20 UTC (rev 20600) @@ -91,9 +91,8 @@ GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1); /* Add an icon to each image list */ - hiconItem = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); + hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); ImageList_AddIcon(hSmall, hiconItem); - DestroyIcon(hiconItem); ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); @@ -574,7 +573,7 @@ wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); wc.lpszClassName = ClassName; - wc.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), + wc.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); if(!RegisterClassEx(&wc)) _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:43:49 UTC (rev 20599) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-06 00:01:20 UTC (rev 20600) @@ -10,7 +10,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDI_SM_ICON ICON "res/applet.ico" +IDI_SM_ICON ICON "res/system.ico" #include "En.rc" #include "De.rc"

1 0

[gedmurphy] 20599: Remove the temp note. Gé is on fire !
by gedmurphy＠svn.reactos.org 05 Jan '06

05 Jan '06

Remove the temp note. Gé is on fire ! Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-05 23:26:43 UTC (rev 20598) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-05 23:43:49 UTC (rev 20599) @@ -145,11 +145,6 @@ pAdapter = pAdapterInfo; - /* temp note until GetAdatersInfo is fixed */ - _tprintf(_T("Note - ipconfig is currently returning incorrect information\n")); - _tprintf(_T("If your adapter is configured correctly, it will usually \n")); - _tprintf(_T("display the loopback, otherwise an error will be displayed\n\n")); - _tprintf(_T("\nReactOS IP Configuration\n\n")); if (bAll)

1 0

[cwittich] 20598: added german translation
by cwittich＠svn.reactos.org 05 Jan '06

05 Jan '06

added german translation Added: trunk/reactos/subsys/system/servman/De.rc Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Added: trunk/reactos/subsys/system/servman/De.rc --- trunk/reactos/subsys/system/servman/De.rc 2006-01-05 23:11:51 UTC (rev 20597) +++ trunk/reactos/subsys/system/servman/De.rc 2006-01-05 23:26:43 UTC (rev 20598) @@ -0,0 +1,63 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit",ID_FILE_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Start",ID_START + MENUITEM "Stopp",ID_STOP + MENUITEM "Pause",ID_PAUSE + MENUITEM "Fortsetzen",ID_RESUME + MENUITEM "Neustart",ID_RESTART + MENUITEM SEPARATOR + MENUITEM "Aktualisieren",ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Eigenschaften",ID_PROP + END + POPUP "Ansicht" + BEGIN + MENUITEM "Anpassen",ID_VIEW_CUSTOMIZE + END + POPUP "Hilfe" + BEGIN + MENUITEM "Info",ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Name" + IDS_SECONDCOLUMN "Beschreibung" + IDS_THIRDCOLUMN "Status" + IDS_FOURTHCOLUMN "Starttyp" + IDS_FITHCOLUMN "Anmelden als" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Gestartet" + IDS_SERVICES_STATUS_STOPPED "Gestoppt" + IDS_SERVICES_YES "Ja" + IDS_SERVICES_UNKNOWN "Unbekannt" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_NUM_SERVICES "Dienste: %d" + IDB_START "res/start.bmp" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Eigenschaften" + IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_EXPORT "Liste exportieren" + IDS_TOOLTIP_START "Dienst starten" + IDS_TOOLTIP_STOP "Dienst beenden" + IDS_TOOLTIP_PAUSE "Diest pausieren" + IDS_TOOLTIP_RESTART "Diest neustarten" +END _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:11:51 UTC (rev 20597) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:26:43 UTC (rev 20598) @@ -13,4 +13,5 @@ IDI_SM_ICON ICON "res/applet.ico" #include "En.rc" +#include "De.rc"

1 0

[gvg] 20597: Don't keep overwriting the first address entry, give the others a chance too.
by gvg＠svn.reactos.org 05 Jan '06

05 Jan '06

Don't keep overwriting the first address entry, give the others a chance too. Fixes IP address display in ipconfig. Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-05 23:10:05 UTC (rev 20596) +++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2006-01-05 23:11:51 UTC (rev 20597) @@ -19,7 +19,7 @@ IF_LIST_ITER(CurrentIF); TDI_STATUS Status = TDI_INVALID_REQUEST; KIRQL OldIrql; - UINT Count = 1; /* Start adapter indices at 1 */ + UINT Count = 0; UINT IfCount = CountInterfaces(); PIPADDR_ENTRY IpAddress = ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); @@ -38,20 +38,21 @@ /* Locate the diffrent addresses and put them the right place */ GetInterfaceIPv4Address( CurrentIF, ADE_UNICAST, - &IpAddress->Addr ); + &IpCurrent->Addr ); GetInterfaceIPv4Address( CurrentIF, ADE_BROADCAST, - &IpAddress->BcastAddr ); + &IpCurrent->BcastAddr ); GetInterfaceIPv4Address( CurrentIF, ADE_ADDRMASK, - &IpAddress->Mask ); + &IpCurrent->Mask ); IpCurrent++; Count++; } EndFor(CurrentIF); + ASSERT( Count == IfCount ); TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); - Status = InfoCopyOut( (PCHAR)IpAddress, sizeof(*IpAddress) * Count, + Status = InfoCopyOut( (PCHAR)IpAddress, sizeof(*IpAddress) * IfCount, Buffer, BufferSize ); ExFreePool( IpAddress );

1 0

[sedwards] 20596: everything I said about mixed case seems to be wrong. everywhere else we allow it in resource files so to be consistant I guess it should be uppercase here
by sedwards＠svn.reactos.org 05 Jan '06

05 Jan '06

everything I said about mixed case seems to be wrong. everywhere else we allow it in resource files so to be consistant I guess it should be uppercase here Added: trunk/reactos/subsys/system/servman/En.rc Deleted: trunk/reactos/subsys/system/servman/en.rc Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Copied: trunk/reactos/subsys/system/servman/En.rc (from rev 20595, trunk/reactos/subsys/system/servman/en.rc) _____ Deleted: trunk/reactos/subsys/system/servman/en.rc --- trunk/reactos/subsys/system/servman/en.rc 2006-01-05 23:00:54 UTC (rev 20595) +++ trunk/reactos/subsys/system/servman/en.rc 2006-01-05 23:10:05 UTC (rev 20596) @@ -1,62 +0,0 @@ - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit",ID_FILE_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART - MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP - END - POPUP "View" - BEGIN - MENUITEM "Customize",ID_VIEW_CUSTOMIZE - END - POPUP "Help" - BEGIN - MENUITEM "About",ID_HELP_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FIRSTCOLUMN "Name" - IDS_SECONDCOLUMN "Description" - IDS_THIRDCOLUMN "Status" - IDS_FOURTHCOLUMN "Startup Type" - IDS_FITHCOLUMN "Log On As" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_STATUS_RUNNING "Started" - IDS_SERVICES_STATUS_STOPPED "Stopped" - IDS_SERVICES_YES "Yes" - IDS_SERVICES_UNKNOWN "Unknown" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SERVICES_NUM_SERVICES "Num Services: %d" - IDB_START "res/start.bmp" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Properties" - IDS_TOOLTIP_REFRESH "Refresh" - IDS_TOOLTIP_EXPORT "Export list" - IDS_TOOLTIP_START "Start service" - IDS_TOOLTIP_STOP "Stop service" - IDS_TOOLTIP_PAUSE "Pause service" - IDS_TOOLTIP_RESTART "Restart service" -END _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:00:54 UTC (rev 20595) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:10:05 UTC (rev 20596) @@ -12,5 +12,5 @@ IDI_SM_ICON ICON "res/applet.ico" -#include "en.rc" +#include "En.rc"

1 0

[gedmurphy] 20595: add to the bootcd for the purpose of testing bug 1253
by gedmurphy＠svn.reactos.org 05 Jan '06

05 Jan '06

add to the bootcd for the purpose of testing bug 1253 Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-05 22:54:30 UTC (rev 20594) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-05 23:00:54 UTC (rev 20595) @@ -200,6 +200,7 @@ subsys\system\rundll32\rundll32.exe 1 subsys\system\sc\sc.exe 1 subsys\system\services\services.exe 1 +subsys\system\servman\servman.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1 subsys\system\userinit\userinit.exe 1

1 0

[greatlrd] 20594: patch from GvG, it fixing the bug for calc = when it showing e-309, Bug 1195, it have even affected python and other apps trying writing out 0 as text string.
by greatlrd＠svn.reactos.org 05 Jan '06

05 Jan '06

patch from GvG, it fixing the bug for calc = when it showing e-309, Bug 1195, it have even affected python and other apps trying writing out 0 as text string. Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c _____ Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2006-01-05 22:24:28 UTC (rev 20593) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2006-01-05 22:54:30 UTC (rev 20594) @@ -210,12 +210,22 @@ } n; n.__n = &__n; + + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) + { + if ( 0 == n.n->mantissal && 0 == n.n->mantissah && 0 == n.n->exponent ) + { + ie = 0; + } + else + { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); + } - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } + exponent = ie/3.321928; + } + if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2006-01-05 22:24:28 UTC (rev 20593) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2006-01-05 22:54:30 UTC (rev 20594) @@ -209,12 +209,22 @@ } n; n.__n = &__n; + + if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) + { + if ( 0 == n.n->mantissal && 0 == n.n->mantissah && 0 == n.n->exponent ) + { + ie = 0; + } + else + { + ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); + } - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } + exponent = ie/3.321928; + } + if ( exp_sign == L'g' || exp_sign == L'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision )

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006