Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57293: [WIN32SS] * Properly implement GetNearestColor
by jgardou＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: jgardou Date: Thu Sep 13 21:49:32 2012 New Revision: 57293 URL: http://svn.reactos.org/svn/reactos?rev=57293&view=rev Log: [WIN32SS] * Properly implement GetNearestColor Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -16,74 +16,6 @@ #define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) #define ROP_TO_ROP4(Rop) ((Rop) >> 16) - -ULONG -TranslateCOLORREF(PDC pdc, COLORREF crColor) -{ - PPALETTE ppalDC, ppalSurface; - ULONG index, ulColor, iBitmapFormat; - EXLATEOBJ exlo; - - switch (crColor >> 24) - { - case 0x00: /* RGB color */ - break; - - case 0x01: /* PALETTEINDEX */ - index = crColor & 0xFFFFFF; - ppalDC = pdc->dclevel.ppal; - if (index >= ppalDC->NumColors) index = 0; - - /* Get the RGB value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - break; - - case 0x02: /* PALETTERGB */ - - if (pdc->dclevel.hpal != StockObjects[DEFAULT_PALETTE]) - { - /* First find the nearest index in the dc palette */ - ppalDC = pdc->dclevel.ppal; - index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); - - /* Get the RGB value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - } - else - { - /* Use the pure color */ - crColor = crColor & 0x00FFFFFF; - } - break; - - case 0x10: /* DIBINDEX */ - /* Mask the value to match the target bpp */ - iBitmapFormat = pdc->dclevel.pSurface->SurfObj.iBitmapFormat; - if (iBitmapFormat == BMF_1BPP) index = crColor & 0x1; - else if (iBitmapFormat == BMF_4BPP) index = crColor & 0xf; - else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; - else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; - else index = crColor & 0xFFFFFF; - return index; - - default: - DPRINT("Unsupported color type %u passed\n", crColor >> 24); - crColor &= 0xFFFFFF; - } - - /* Initialize an XLATEOBJ from RGB to the target surface */ - ppalSurface = pdc->dclevel.pSurface->ppal; - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppalSurface, 0xFFFFFF, 0, 0); - - /* Translate the color to the target format */ - ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); - - /* Cleanup the XLATEOBJ */ - EXLATEOBJ_vCleanup(&exlo); - - return ulColor; -} - BOOL APIENTRY NtGdiAlphaBlend( Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -162,6 +162,18 @@ HPALETTE hpal, BOOL ForceBackground); +/* dcutil.c */ + +COLORREF +FASTCALL +IntGdiSetBkColor (HDC hDC, COLORREF Color); +INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); +COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); +UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); +VOID FASTCALL DCU_SetDcUndeletable(HDC); +BOOL FASTCALL IntSetDefaultRegion(PDC); +ULONG TranslateCOLORREF(PDC pdc, COLORREF crColor); + INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); @@ -179,20 +191,15 @@ VOID NTAPI DC_vRestoreDC(IN PDC pdc, INT iSaveLevel); -VOID FASTCALL DCU_SetDcUndeletable(HDC); VOID NTAPI DC_vFreeDcAttr(PDC pdc); VOID NTAPI DC_vInitDc(PDC pdc, DCTYPE dctype, PPDEVOBJ ppdev); -COLORREF FASTCALL IntGdiSetBkColor (HDC hDC, COLORREF Color); -INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); -COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); -UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); VOID FASTCALL IntGdiReferencePdev(PPDEVOBJ pPDev); VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); -BOOL FASTCALL IntSetDefaultRegion(PDC); + BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -551,3 +551,73 @@ DC_UnlockDc(pdc); return ret; } + +/* Translates a COLORREF to the right color in the specified DC color space */ +ULONG +TranslateCOLORREF(PDC pdc, COLORREF crColor) +{ + PPALETTE ppalDC, ppalSurface; + ULONG index, ulColor, iBitmapFormat; + EXLATEOBJ exlo; + + switch (crColor >> 24) + { + case 0x00: /* RGB color */ + break; + + case 0x01: /* PALETTEINDEX */ + index = crColor & 0xFFFFFF; + ppalDC = pdc->dclevel.ppal; + if (index >= ppalDC->NumColors) index = 0; + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + break; + + case 0x02: /* PALETTERGB */ + + if (pdc->dclevel.hpal != StockObjects[DEFAULT_PALETTE]) + { + /* First find the nearest index in the dc palette */ + ppalDC = pdc->dclevel.ppal; + index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + } + else + { + /* Use the pure color */ + crColor = crColor & 0x00FFFFFF; + } + break; + + case 0x10: /* DIBINDEX */ + /* Mask the value to match the target bpp */ + iBitmapFormat = pdc->dclevel.pSurface->SurfObj.iBitmapFormat; + if (iBitmapFormat == BMF_1BPP) index = crColor & 0x1; + else if (iBitmapFormat == BMF_4BPP) index = crColor & 0xf; + else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; + else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; + else index = crColor & 0xFFFFFF; + return index; + + default: + DPRINT("Unsupported color type %u passed\n", crColor >> 24); + crColor &= 0xFFFFFF; + } + + /* Initialize an XLATEOBJ from RGB to the target surface */ + ppalSurface = pdc->dclevel.pSurface->ppal; + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppalSurface, 0xFFFFFF, 0, 0); + + /* Translate the color to the target format */ + ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); + + /* Cleanup the XLATEOBJ */ + EXLATEOBJ_vCleanup(&exlo); + + return ulColor; +} + + Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Thu Sep 13 21:49:32 2012 @@ -684,47 +684,47 @@ return FALSE; } -COLORREF APIENTRY NtGdiGetNearestColor(HDC hDC, COLORREF Color) -{ - COLORREF nearest = CLR_INVALID; - PDC dc; - PPALETTE palGDI; - LONG RBits, GBits, BBits; - - dc = DC_LockDc(hDC); - if (NULL != dc) - { - HPALETTE hpal = dc->dclevel.hpal; - palGDI = PALETTE_ShareLockPalette(hpal); - if (!palGDI) - { - DC_UnlockDc(dc); - return nearest; - } - - if (palGDI->flFlags & PAL_INDEXED) - { - ULONG index; - index = PALETTE_ulGetNearestPaletteIndex(palGDI, Color); - nearest = PALETTE_ulGetRGBColorFromIndex(palGDI, index); - } - else if (palGDI->flFlags & PAL_RGB || palGDI->flFlags & PAL_BGR) - { - nearest = Color; - } - else if (palGDI->flFlags & PAL_BITFIELDS) - { - RBits = 8 - GetNumberOfBits(palGDI->RedMask); - GBits = 8 - GetNumberOfBits(palGDI->GreenMask); - BBits = 8 - GetNumberOfBits(palGDI->BlueMask); - nearest = RGB( - (GetRValue(Color) >> RBits) << RBits, - (GetGValue(Color) >> GBits) << GBits, - (GetBValue(Color) >> BBits) << BBits); - } - PALETTE_ShareUnlockPalette(palGDI); - DC_UnlockDc(dc); - } +COLORREF +APIENTRY +NtGdiGetNearestColor( + _In_ HDC hDC, + _In_ COLORREF Color) +{ + COLORREF nearest = CLR_INVALID; + PDC dc; + EXLATEOBJ exlo; + PPALETTE ppal; + + dc = DC_LockDc(hDC); + + if(dc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + + if(dc->dclevel.pSurface == NULL) + ppal = gppalMono; + else + ppal = dc->dclevel.pSurface->ppal; + + /* Translate the color to the DC format */ + Color = TranslateCOLORREF(dc, Color); + + /* XLATE it back to RGB color space */ + EXLATEOBJ_vInitialize(&exlo, + ppal, + &gpalRGB, + 0, + RGB(0xff, 0xff, 0xff), + RGB(0, 0, 0)); + + nearest = XLATEOBJ_iXlate(&exlo.xlo, Color); + + EXLATEOBJ_vCleanup(&exlo); + + /* We're done */ + DC_UnlockDc(dc); return nearest; }

1 0

[akhaldi] 57292: * Reapply r57265 now that the testbot issues are solved. [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5. CORE-6563 #comment Committed the 0.43f5 sync.
by akhaldi＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: akhaldi Date: Thu Sep 13 21:07:44 2012 New Revision: 57292 URL: http://svn.reactos.org/svn/reactos?rev=57292&view=rev Log: * Reapply r57265 now that the testbot issues are solved. [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5. CORE-6563 #comment Committed the 0.43f5 sync. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/todo.txt trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

1 0

[jimtabor] 57291: [User32] - Aric Stewart : While calculating lines, discard uniscribe data for non-visible lines. - Nikolay Sivov : Release uniscribe data on Edit control destruction (valgrind). -...
by jimtabor＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: jimtabor Date: Thu Sep 13 20:44:04 2012 New Revision: 57291 URL: http://svn.reactos.org/svn/reactos?rev=57291&view=rev Log: [User32] - Aric Stewart : While calculating lines, discard uniscribe data for non-visible lines. - Nikolay Sivov : Release uniscribe data on Edit control destruction (valgrind). - Sync Port wine. - Someone needs to post a wine bug report due to the lack of support for Ctrl+Backspace. Debug fixme was added. See bug 1419. Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Thu Sep 13 20:44:04 2012 @@ -411,6 +411,12 @@ return line_def->ssa; } +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); +} + static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, INT line) { LINEDEF *line_def; @@ -473,6 +479,7 @@ INT line_count = es->line_count; INT orig_net_length; RECT rc; + INT vlc; if (istart == iend && delta == 0) return; @@ -513,6 +520,7 @@ fw = es->format_rect.right - es->format_rect.left; current_position = es->text + current_line->index; + vlc = get_vertical_line_count(es); do { if (current_line != start_line) { @@ -696,6 +704,11 @@ es->text_width = max(es->text_width, current_line->width); current_position += current_line->length; previous_line = current_line; + + /* Discard data for non-visible lines. It will be calculated as needed */ + if ((line_index < es->y_offset) || (line_index > es->y_offset + vlc)) + EDIT_InvalidateUniscribeData_linedef(current_line); + current_line = current_line->next; line_index++; } while (previous_line->ending != END_0); @@ -1442,13 +1455,6 @@ EDIT_GetLineRect(es, 0, start, end, &line_rect); if (IntersectRect(&rc, &line_rect, &es->format_rect)) EDIT_UpdateText(es, &rc, TRUE); -} - - -static inline INT get_vertical_line_count(EDITSTATE *es) -{ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - return max(1,vlc); } /********************************************************************* @@ -3544,6 +3550,12 @@ if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; + case VK_BACK: + if (control) + { + FIXME("Ctrl+Backspace\n"); // See bug 1419. + } + break; } return TRUE; } @@ -4618,6 +4630,7 @@ pc = pp; } + EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

1 0

[jimtabor] 57290: [Win32SS] - Based on wine Alexandre Julliard: ScrollWindow should not use a cached DC, unlike ScrollWindowEx.
by jimtabor＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: jimtabor Date: Thu Sep 13 01:22:33 2012 New Revision: 57290 URL: http://svn.reactos.org/svn/reactos?rev=57290&view=rev Log: [Win32SS] - Based on wine Alexandre Julliard: ScrollWindow should not use a cached DC, unlike ScrollWindowEx. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Sep 13 01:22:33 2012 @@ -1613,6 +1613,7 @@ HDC hDC; HRGN hrgnOwn = NULL, hrgnTemp; HWND hwndCaret; + DWORD dcxflags = 0; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1669,7 +1670,25 @@ else hrgnOwn = IntSysCreateRectRgn(0, 0, 0, 0); - hDC = UserGetDCEx(Window, 0, DCX_CACHE | DCX_USESTYLE); + /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ + if (flags & SW_SCROLLWNDDCE) + { + dcxflags = DCX_USESTYLE; + + if (!(Window->pcls->style & (CS_OWNDC|CS_CLASSDC))) + dcxflags |= DCX_CACHE; // AH??? wine~ If not Powned or with Class go Cheap! + + if (flags & SW_SCROLLCHILDREN && Window->style & WS_CLIPCHILDREN) + dcxflags |= DCX_CACHE|DCX_NOCLIPCHILDREN; + } + else + { + /* So in this case ScrollWindowEx uses Cache DC. */ + dcxflags = DCX_CACHE|DCX_USESTYLE; + if (flags & SW_SCROLLCHILDREN) dcxflags |= DCX_NOCLIPCHILDREN; + } + + hDC = UserGetDCEx(Window, 0, dcxflags); if (!hDC) { /* FIXME: SetLastError? */ Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Thu Sep 13 01:22:33 2012 @@ -1900,9 +1900,10 @@ prcClip, 0, NULL, - (lpRect ? 0 : SW_SCROLLCHILDREN) | SW_INVALIDATE) != ERROR; -} - + (lpRect ? 0 : SW_SCROLLCHILDREN) | (SW_ERASE|SW_INVALIDATE|SW_SCROLLWNDDCE)) != ERROR; +} + +/* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ /* * @implemented @@ -1917,6 +1918,11 @@ LPRECT prcUpdate, UINT flags) { + if (flags & SW_SMOOTHSCROLL) + { + FIXME("SW_SMOOTHSCROLL not supported."); + // Fall through.... + } return NtUserScrollWindowEx(hWnd, dx, dy,

1 0

[cgutman] 57289: [NDIS] - NdisReadConfiguration should return NdisParameterInteger for requests for NdisParameterHexInteger - Assert that conversion to integer from string does not fail - Always tr...
by cgutman＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: cgutman Date: Thu Sep 13 01:04:21 2012 New Revision: 57289 URL: http://svn.reactos.org/svn/reactos?rev=57289&view=rev Log: [NDIS] - NdisReadConfiguration should return NdisParameterInteger for requests for NdisParameterHexInteger - Assert that conversion to integer from string does not fail - Always trigger the ISR function if MiniportInitialize or MiniportHalt is executing CORE-6064 #comment Please try to replicate with DEBUG_ULTRA turned on in NDIS Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -658,13 +658,15 @@ str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; str.Buffer = (PWCHAR)KeyInformation->Data; - if (Base != 0 && IsValidNumericString(&str, Base) && - ((*Status = RtlUnicodeStringToInteger(&str, Base, - &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS)) + if (Base != 0 && IsValidNumericString(&str, Base)) { + *Status = RtlUnicodeStringToInteger(&str, Base, &(*ParameterValue)->ParameterData.IntegerData); + ASSERT(*Status == STATUS_SUCCESS); + NDIS_DbgPrint(MAX_TRACE, ("NdisParameter(Hex)Integer\n")); - (*ParameterValue)->ParameterType = ParameterType; + /* MSDN documents that this is returned for all integers, regardless of the ParameterType passed in */ + (*ParameterValue)->ParameterType = NdisParameterInteger; } else { @@ -697,8 +699,9 @@ ExFreePool(KeyInformation); return; } - - if ((*ParameterValue)->ParameterType != ParameterType) + + if (((*ParameterValue)->ParameterType != ParameterType) && + !((ParameterType == NdisParameterHexInteger) && ((*ParameterValue)->ParameterType == NdisParameterInteger))) { NDIS_DbgPrint(MIN_TRACE, ("Parameter type mismatch! (Requested: %d | Received: %d)\n", ParameterType, (*ParameterValue)->ParameterType)); Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -65,7 +65,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); - if (NdisInterrupt->IsrRequested) { + /* FIXME: This probably isn't the right check for MiniportInitialize, but we need to see what Windows uses here */ + if ((NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted) || (NdisInterrupt->IsrRequested)) { NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 13 01:04:21 2012 @@ -2161,6 +2161,10 @@ KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + /* Set this here so MiniportISR will be forced to run for interrupts generated in MiniportHalt */ + Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; + Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HaltHandler)(Adapter); IoSetDeviceInterfaceState(&Adapter->NdisMiniportBlock.SymbolicLinkName, FALSE); @@ -2187,9 +2191,6 @@ EthDeleteFilter(Adapter->NdisMiniportBlock.EthDB); Adapter->NdisMiniportBlock.EthDB = NULL; } - - Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; - Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; return STATUS_SUCCESS; }

1 0

[mnordell] 57288: Add comment explaining initialization.
by mnordell＠svn.reactos.org 13 Sep '12

13 Sep '12

Author: mnordell Date: Thu Sep 13 00:52:12 2012 New Revision: 57288 URL: http://svn.reactos.org/svn/reactos?rev=57288&view=rev Log: Add comment explaining initialization. Modified: trunk/reactos/subsystems/csr/csrsrv/process.c Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Thu Sep 13 00:52:12 2012 @@ -1211,7 +1211,7 @@ BOOLEAN FirstTry; ULONG i; PCSR_SERVER_DLL ServerDll; - ULONG Result = 0; + ULONG Result = 0; /* Intentionally invalid enumeratee to silence compiler warning */ /* Acquire process lock */ CsrAcquireProcessLock();

1 0

[tkreuzer] 57287: [FREELDR] Fix an x64 compilation warning Patch by Hermes Belusca CORE-6641
by tkreuzer＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: tkreuzer Date: Wed Sep 12 21:20:48 2012 New Revision: 57287 URL: http://svn.reactos.org/svn/reactos?rev=57287&view=rev Log: [FREELDR] Fix an x64 compilation warning Patch by Hermes Belusca CORE-6641 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Wed Sep 12 21:20:48 2012 @@ -150,7 +150,7 @@ TotalSectors -= ReadSectors; } - *Count = Ptr - (UCHAR *)Buffer; + *Count = (ULONG)(Ptr - (UCHAR*)Buffer); return (!ret) ? EIO : ESUCCESS; }

1 0

[tkreuzer] 57286: [GDI32] Fix SetTextAlign: - return GDI_ERROR (-1) not 0 on error - properly handle LAYOUT_RTL
by tkreuzer＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: tkreuzer Date: Wed Sep 12 18:17:10 2012 New Revision: 57286 URL: http://svn.reactos.org/svn/reactos?rev=57286&view=rev Log: [GDI32] Fix SetTextAlign: - return GDI_ERROR (-1) not 0 on error - properly handle LAYOUT_RTL Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] Wed Sep 12 18:17:10 2012 @@ -572,7 +572,7 @@ UINT fMode) { PDC_ATTR Dc_Attr; - INT OldMode = 0; + INT OldMode; #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -593,17 +593,16 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldMode; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; OldMode = Dc_Attr->lTextAlign; Dc_Attr->lTextAlign = fMode; // Raw if (Dc_Attr->dwLayout & LAYOUT_RTL) { - if(!(fMode & TA_CENTER)) fMode |= TA_RIGHT; - } - Dc_Attr->flTextAlign = fMode & (TA_BASELINE|TA_UPDATECP|TA_CENTER); + if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT; + } + Dc_Attr->flTextAlign = fMode & TA_MASK; return OldMode; - }

1 0

[ion] 57285: [NTOSKRNL]: I fail.
by ion＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: ion Date: Wed Sep 12 17:06:49 2012 New Revision: 57285 URL: http://svn.reactos.org/svn/reactos?rev=57285&view=rev Log: [NTOSKRNL]: I fail. Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Wed Sep 12 17:06:49 2012 @@ -184,16 +184,21 @@ #define SepAcquireTokenLockExclusive(Token) \ +{ \ KeEnterCriticalRegion(); \ ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ - +} #define SepAcquireTokenLockShared(Token) \ +{ \ KeEnterCriticalRegion(); \ ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ +} #define SepReleaseTokenLock(Token) \ +{ \ ExReleaseResource(((PTOKEN)Token)->TokenLock); \ KeLeaveCriticalRegion(); \ +} // // Token Functions

1 0

[ion] 57284: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, j...
by ion＠svn.reactos.org 12 Sep '12

12 Sep '12

Author: ion Date: Wed Sep 12 16:29:28 2012 New Revision: 57284 URL: http://svn.reactos.org/svn/reactos?rev=57284&view=rev Log: [NTOSKRNL]: Use the token lock acquire/release macros that were already written instead of manually doing it. Also fix the macros since they didn't work in GCC. No functional change, just code cleanup. Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/access.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -1,4 +1,28 @@ #pragma once + +typedef struct _KNOWN_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG SidStart; +} KNOWN_ACE, *PKNOWN_ACE; + +typedef struct _KNOWN_OBJECT_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + ULONG Flags; + ULONG SidStart; +} KNOWN_OBJECT_ACE, *PKNOWN_OBJECT_ACE; + +typedef struct _KNOWN_COMPOUND_ACE +{ + ACE_HEADER Header; + ACCESS_MASK Mask; + USHORT CompoundAceType; + USHORT Reserved; + ULONG SidStart; +} KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; PSID FORCEINLINE @@ -75,6 +99,8 @@ return Descriptor->Sacl; } } + +#ifndef RTL_H /* SID Authorities */ extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; @@ -156,6 +182,19 @@ extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; + +#define SepAcquireTokenLockExclusive(Token) \ + KeEnterCriticalRegion(); \ + ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ + +#define SepAcquireTokenLockShared(Token) \ + KeEnterCriticalRegion(); \ + ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ + +#define SepReleaseTokenLock(Token) \ + ExReleaseResource(((PTOKEN)Token)->TokenLock); \ + KeLeaveCriticalRegion(); \ + // // Token Functions // @@ -434,24 +473,6 @@ OUT PACCESS_TOKEN* NewToken ); -#define SepAcquireTokenLockExclusive(Token) \ - do { \ - KeEnterCriticalRegion(); \ - ExAcquireResourceExclusive(((PTOKEN)Token)->TokenLock, TRUE); \ - while(0) - -#define SepAcquireTokenLockShared(Token) \ - do { \ - KeEnterCriticalRegion(); \ - ExAcquireResourceShared(((PTOKEN)Token)->TokenLock, TRUE); \ - while(0) - -#define SepReleaseTokenLock(Token) \ - do { \ - ExReleaseResource(((PTOKEN)Token)->TokenLock); \ - KeLeaveCriticalRegion(); \ - while(0) - VOID NTAPI SeQuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); @@ -460,4 +481,6 @@ SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); +#endif + /* EOF */ Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -130,11 +130,7 @@ ASSERT(Sid != NULL); /* Lock the token if needed */ - if (!TokenLocked) - { - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); - } + if (!TokenLocked) SepAcquireTokenLockShared(Token); /* Check if the owner SID is found, handling restricted case as well */ Result = SepSidInToken(Token, Sid); @@ -144,11 +140,7 @@ } /* Release the lock if we had acquired it */ - if (!TokenLocked) - { - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); - } + if (!TokenLocked) SepReleaseTokenLock(Token); /* Return the result */ return Result; @@ -168,15 +160,13 @@ TokenControl->TokenSource = Token->TokenSource; /* Lock the token */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); + SepAcquireTokenLockShared(Token); /* Capture the modified it */ TokenControl->ModifiedId = Token->ModifiedId; /* Unlock it */ - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(Token); } NTSTATUS @@ -327,13 +317,11 @@ ClientToken = SubjectContext->ClientToken; /* Always lock the primary */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(PrimaryToken->TokenLock, TRUE); + SepAcquireTokenLockShared(PrimaryToken); /* Lock the impersonation one if it's there */ if (!ClientToken) return; - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(ClientToken->TokenLock, TRUE); + SepAcquireTokenLockShared(ClientToken); } /* @@ -351,13 +339,11 @@ ClientToken = SubjectContext->ClientToken; /* Always unlock the primary one */ - ExReleaseResourceLite(PrimaryToken->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(PrimaryToken); /* Unlock the impersonation one if it's there */ if (!ClientToken) return; - ExReleaseResourceLite(ClientToken->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(ClientToken); } /* Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Wed Sep 12 16:29:28 2012 @@ -952,8 +952,7 @@ SeCaptureSubjectContext(&SubjectSecurityContext); /* Lock the token */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(Token->TokenLock, TRUE); + SepAcquireTokenLockShared(Token); /* Check if the token is the owner and grant WRITE_DAC and READ_CONTROL rights */ if (DesiredAccess & (WRITE_DAC | READ_CONTROL | MAXIMUM_ALLOWED)) @@ -990,8 +989,7 @@ /* Release subject context and unlock the token */ SeReleaseSubjectContext(&SubjectSecurityContext); - ExReleaseResourceLite(Token->TokenLock); - KeLeaveCriticalRegion(); + SepReleaseTokenLock(Token); /* Release the captured security descriptor */ SeReleaseSecurityDescriptor(CapturedSecurityDescriptor,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs