Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[pschweitzer] 50616: [RTL] Minor code changes to RTL (one would call them "optimisation"). Added some missing paged code. Plus added useful asserts (used to catch r50615 bug!)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 7 23:23:33 2011 New Revision: 50616 URL: http://svn.reactos.org/svn/reactos?rev=50616&view=rev Log: [RTL] Minor code changes to RTL (one would call them "optimisation"). Added some missing paged code. Plus added useful asserts (used to catch r50615 bug!) Modified: trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=50616&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Mon Feb 7 23:23:33 2011 @@ -235,6 +235,8 @@ ULONG Size = 0; ULONG i; + PAGED_CODE_RTL(); + if (NlsMbCodePageTag == FALSE) { /* single-byte code page */ @@ -299,6 +301,8 @@ ULONG MbSize) { ULONG Length = 0; + + PAGED_CODE_RTL(); if (!NlsMbCodePageTag) { @@ -503,6 +507,8 @@ { ULONG Size = 0; ULONG i; + + PAGED_CODE_RTL(); if (NlsMbCodePageTag == FALSE) { Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5061… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Mon Feb 7 23:23:33 2011 @@ -76,7 +76,14 @@ PAGED_CODE_RTL(); - Length = RtlAnsiStringToUnicodeSize(AnsiSource); + if (NlsMbCodePageTag == FALSE) + { + Length = AnsiSource->Length * 2 + sizeof(WCHAR); + } + else + { + Length = RtlxAnsiStringToUnicodeSize(AnsiSource); + } if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; UniDest->Length = (USHORT)Length - sizeof(WCHAR); @@ -90,6 +97,9 @@ { return STATUS_BUFFER_OVERFLOW; } + + /* UniDest->MaximumLength must be even due to sizeof(WCHAR) being 2 */ + ASSERT(!(UniDest->MaximumLength & 1) && UniDest->Length <= UniDest->MaximumLength); Status = RtlMultiByteToUnicodeN(UniDest->Buffer, UniDest->Length, @@ -122,6 +132,8 @@ RtlxAnsiStringToUnicodeSize(IN PCANSI_STRING AnsiString) { ULONG Size; + + PAGED_CODE_RTL(); /* Convert from Mb String to Unicode Size */ RtlMultiByteToUnicodeSize(&Size, @@ -963,7 +975,16 @@ PAGED_CODE_RTL(); - Length = RtlUnicodeStringToAnsiSize(UniSource); + ASSERT(!(UniSource->Length & 1)); + + if (NlsMbCodePageTag == FALSE) + { + Length = (UniSource->Length + sizeof(WCHAR)) / sizeof(WCHAR); + } + else + { + Length = RtlxUnicodeStringToAnsiSize(UniSource); + } if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; AnsiDest->Length = (USHORT)Length - sizeof(CHAR); @@ -1953,6 +1974,10 @@ { ULONG Size; + PAGED_CODE_RTL(); + + ASSERT(!(UnicodeString->Length & 1)); + /* Convert the Unicode String to Mb Size */ RtlUnicodeToMultiByteSize(&Size, UnicodeString->Buffer,

13 years, 10 months

[pschweitzer] 50615: [USETUP] Fix a really mean bug: wcslen() returns the size in characters whereas MaximumLength has to be in bytes. Now, this sets MaximumLength to its appropriate size and preve...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 7 23:16:29 2011 New Revision: 50615 URL: http://svn.reactos.org/svn/reactos?rev=50615&view=rev Log: [USETUP] Fix a really mean bug: wcslen() returns the size in characters whereas MaximumLength has to be in bytes. Now, this sets MaximumLength to its appropriate size and prevents some memory issues (and buffers having odd size, which is weird for an unicode string...). Modified: trunk/reactos/base/setup/usetup/cabinet.c Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Mon Feb 7 23:16:29 2011 @@ -890,7 +890,7 @@ RtlInitAnsiString(&AnsiString, Search->File->FileName); wcscpy(DestName, DestPath); - UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName); + UnicodeString.MaximumLength = sizeof(DestName) - wcslen(DestName) * sizeof(WCHAR); UnicodeString.Buffer = DestName + wcslen(DestName); UnicodeString.Length = 0; RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE);

13 years, 10 months

[pschweitzer] 50614: [KMTEST] Adding a new test for FsRtlIsNameInExpression(). Which is failing... Will that end a day?!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 7 21:38:55 2011 New Revision: 50614 URL: http://svn.reactos.org/svn/reactos?rev=50614&view=rev Log: [KMTEST] Adding a new test for FsRtlIsNameInExpression(). Which is failing... Will that end a day?! Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Mon Feb 7 21:38:55 2011 @@ -135,6 +135,10 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Name, L"ntoskrnl.exe."); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"*.c.d"); + RtlInitUnicodeString(&Name, L"a.b.c.d"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } VOID FsRtlIsDbcsInExpressionTest() @@ -242,6 +246,10 @@ RtlInitAnsiString(&Name, "ntoskrnl.exe"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Name, "ntoskrnl.exe."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "*.c.d"); + RtlInitAnsiString(&Name, "a.b.c.d"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); }

13 years, 10 months

[fireball] 50613: - Implement support for smoothed (gray) glyph rendering. - Modify GreTextOut to use sharp rendering for non-antialised glyphs and smooth for AA ones respectively. - Removed unnece...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 7 21:11:21 2011 New Revision: 50613 URL: http://svn.reactos.org/svn/reactos?rev=50613&view=rev Log: - Implement support for smoothed (gray) glyph rendering. - Modify GreTextOut to use sharp rendering for non-antialised glyphs and smooth for AA ones respectively. - Removed unnecessary unused code from font.c. - This fixes bug 5327 if FontSmoothing is enabled in the registry. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Mon Feb 7 21:11:21 2011 @@ -128,8 +128,8 @@ #endif } -static void SharpGlyphGray(PDC physDev, INT x, INT y, - void *bitmap, GlyphInfo *gi, EBRUSHOBJ *pTextBrush) +void SharpGlyphGray(PDC physDev, INT x, INT y, + void *bitmap, GlyphInfo *gi, EBRUSHOBJ *pTextBrush) { unsigned char *srcLine = bitmap, *src, bits; int width = gi->width; @@ -191,6 +191,136 @@ } } +/*static*/ void SmoothGlyphGray(PDC physDev, INT x, INT y, + void *bitmap, GlyphInfo *gi, EBRUSHOBJ *pTextBrush) +{ + unsigned char *srcLine = bitmap, *src, bits; + int width = gi->width; + int stride = ((width + 3) & ~3); + int height = gi->height; + int w,h; + RECTL rcBounds; + COLORREF srcColor; + BYTE rVal, gVal, bVal; + PFN_DIB_PutPixel DibPutPixel; + PFN_DIB_GetPixel DibGetPixel; + SIZEL slSize; + HBITMAP charBitmap; + PSURFACE pCharSurf; + POINTL BrushOrigin = {0,0}; + POINTL SourcePoint; + BOOLEAN bRet; + HPALETTE hDestPalette; + PPALETTE ppalDst; + EXLATEOBJ exloRGB2Dst, exloDst2RGB; + ULONG xlBrushColor; + + /* Create a 24bpp bitmap for the glyph + background */ + slSize.cx = gi->width; + slSize.cy = gi->height; + if (height == 0) return; + charBitmap = GreCreateBitmap(slSize, 0, BMF_24BPP, 0, NULL); + + /* Get the object pointer */ + pCharSurf = SURFACE_LockSurface(charBitmap); + + /* Create XLATE objects */ + /* (the following 3 lines is the old way of doing that, + until yarotows is merged) */ + hDestPalette = physDev->dclevel.pSurface->hDIBPalette; + if (!hDestPalette) hDestPalette = pPrimarySurface->devinfo.hpalDefault; + ppalDst = PALETTE_LockPalette(hDestPalette); + + EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, /*psurf->ppal*/ppalDst, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloDst2RGB, /*psurf->ppal*/ppalDst, &gpalRGB, 0, 0, 0); + + PALETTE_UnlockPalette(ppalDst); + + /* Translate the brush color */ + xlBrushColor = XLATEOBJ_iXlate(&exloDst2RGB.xlo, pTextBrush->BrushObject.iSolidColor); + + /* Get pixel routines address */ + DibPutPixel = DibFunctionsForBitmapFormat[pCharSurf->SurfObj.iBitmapFormat].DIB_PutPixel; + DibGetPixel = DibFunctionsForBitmapFormat[pCharSurf->SurfObj.iBitmapFormat].DIB_GetPixel; + + /* Blit background into this bitmap */ + rcBounds.left = 0; rcBounds.top = 0; + rcBounds.right = width; rcBounds.bottom = height; + + x -= gi->x; + y -= gi->y; + + SourcePoint.x = x; SourcePoint.y = y; + + bRet = GrepBitBltEx( + &pCharSurf->SurfObj, + &physDev->dclevel.pSurface->SurfObj, + NULL, + NULL, + &exloDst2RGB.xlo, + &rcBounds, + &SourcePoint, + NULL, + &physDev->eboFill.BrushObject, + &BrushOrigin, + ROP3_TO_ROP4(SRCCOPY), + TRUE); + + for (h=0; h<height; h++) + { + src = srcLine; + srcLine += stride; + bits = *src++; + + for (w=0;w<width;w++) + { + if (bits == 0xff) + { + DibPutPixel(&pCharSurf->SurfObj, w, h, xlBrushColor); + } + else + { + srcColor = DibGetPixel(&pCharSurf->SurfObj, w, h); + rVal = ((UCHAR)~bits * (USHORT)GetRValue(srcColor) + bits * (USHORT)GetRValue(xlBrushColor)) >> 8; + gVal = ((UCHAR)~bits * (USHORT)GetGValue(srcColor) + bits * (USHORT)GetGValue(xlBrushColor)) >> 8; + bVal = ((UCHAR)~bits * (USHORT)GetBValue(srcColor) + bits * (USHORT)GetBValue(xlBrushColor)) >> 8; + DibPutPixel(&pCharSurf->SurfObj, w, h, RGB(rVal, gVal, bVal)); + } + + bits = *src++; + } + } + + /* Blit the modified bitmap back */ + rcBounds.left = x; rcBounds.top = y; + rcBounds.right = rcBounds.left + width; rcBounds.bottom = rcBounds.top + height; + + SourcePoint.x = 0; SourcePoint.y = 0; + + bRet = GrepBitBltEx( + &physDev->dclevel.pSurface->SurfObj, + &pCharSurf->SurfObj, + NULL, + physDev->CombinedClip, + &exloRGB2Dst.xlo, + &rcBounds, + &SourcePoint, + NULL, + &physDev->eboFill.BrushObject, + &BrushOrigin, + ROP3_TO_ROP4(SRCCOPY), + TRUE); + + SURFACE_UnlockSurface(pCharSurf); + + /* Cleanup exlate objects */ + EXLATEOBJ_vCleanup(&exloRGB2Dst); + EXLATEOBJ_vCleanup(&exloDst2RGB); + + /* Release the surface and delete the bitmap */ + GreDeleteObject(charBitmap); +} + /* PUBLIC FUNCTIONS **********************************************************/ VOID NTAPI @@ -204,6 +334,7 @@ EBRUSHOBJ pTextPen; PBRUSH ppen; HPEN hpen; + void (* sharp_glyph_fn)(PDC, INT, INT, void *, GlyphInfo *, EBRUSHOBJ *); /* Create pen for text output */ hpen = GreCreatePen(PS_SOLID, 1, pDC->crForegroundClr, NULL); @@ -214,152 +345,34 @@ return; EBRUSHOBJ_vInit(&pTextPen, ppen, pDC); - if(aa_type == AA_None || pDC->dclevel.pSurface->SurfObj.iBitmapFormat == BMF_1BPP) - { - void (* sharp_glyph_fn)(PDC, INT, INT, void *, GlyphInfo *, EBRUSHOBJ *); - - if(aa_type == AA_None) - sharp_glyph_fn = SharpGlyphMono; + if(aa_type == AA_None) + sharp_glyph_fn = SharpGlyphMono; + else + sharp_glyph_fn = SmoothGlyphGray; + + for(idx = 0; idx < count; idx++) { + sharp_glyph_fn(pDC, + pDC->ptlDCOrig.x + x + offset.x, + pDC->ptlDCOrig.y + y + offset.y, + formatEntry->bitmaps[wstr[idx]], + &formatEntry->gis[wstr[idx]], + &pTextPen); + if(lpDx) + { + if(flags & ETO_PDY) + { + offset.x += lpDx[idx * 2]; + offset.y += lpDx[idx * 2 + 1]; + } + else + offset.x += lpDx[idx]; + } else - sharp_glyph_fn = SharpGlyphGray; - - for(idx = 0; idx < count; idx++) { - sharp_glyph_fn(pDC, - pDC->ptlDCOrig.x + x + offset.x, - pDC->ptlDCOrig.y + y + offset.y, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]], - &pTextPen); - if(lpDx) - { - if(flags & ETO_PDY) - { - offset.x += lpDx[idx * 2]; - offset.y += lpDx[idx * 2 + 1]; - } - else - offset.x += lpDx[idx]; - } - else - { - offset.x += formatEntry->gis[wstr[idx]].xOff; - offset.y += formatEntry->gis[wstr[idx]].yOff; - } - } - } else { - UNIMPLEMENTED; -#if 0 - OUTDATED (need to merge 47289 and higher) - XImage *image; - int image_x, image_y, image_off_x, image_off_y, image_w, image_h; - RECT extents = {0, 0, 0, 0}; - POINT cur = {0, 0}; - int w = physDev->drawable_rect.right - physDev->drawable_rect.left; - int h = physDev->drawable_rect.bottom - physDev->drawable_rect.top; - - TRACE("drawable %dx%d\n", w, h); - - for(idx = 0; idx < count; idx++) { - if(extents.left > cur.x - formatEntry->gis[wstr[idx]].x) - extents.left = cur.x - formatEntry->gis[wstr[idx]].x; - if(extents.top > cur.y - formatEntry->gis[wstr[idx]].y) - extents.top = cur.y - formatEntry->gis[wstr[idx]].y; - if(extents.right < cur.x - formatEntry->gis[wstr[idx]].x + formatEntry->gis[wstr[idx]].width) - extents.right = cur.x - formatEntry->gis[wstr[idx]].x + formatEntry->gis[wstr[idx]].width; - if(extents.bottom < cur.y - formatEntry->gis[wstr[idx]].y + formatEntry->gis[wstr[idx]].height) - extents.bottom = cur.y - formatEntry->gis[wstr[idx]].y + formatEntry->gis[wstr[idx]].height; - if(lpDx) { - offset += lpDx[idx]; - cur.x = offset * cosEsc; - cur.y = offset * -sinEsc; - } else { - cur.x += formatEntry->gis[wstr[idx]].xOff; - cur.y += formatEntry->gis[wstr[idx]].yOff; - } - } - TRACE("glyph extents %d,%d - %d,%d drawable x,y %d,%d\n", extents.left, extents.top, - extents.right, extents.bottom, physDev->dc_rect.left + x, physDev->dc_rect.top + y); - - if(physDev->dc_rect.left + x + extents.left >= 0) { - image_x = physDev->dc_rect.left + x + extents.left; - image_off_x = 0; - } else { - image_x = 0; - image_off_x = physDev->dc_rect.left + x + extents.left; - } - if(physDev->dc_rect.top + y + extents.top >= 0) { - image_y = physDev->dc_rect.top + y + extents.top; - image_off_y = 0; - } else { - image_y = 0; - image_off_y = physDev->dc_rect.top + y + extents.top; - } - if(physDev->dc_rect.left + x + extents.right < w) - image_w = physDev->dc_rect.left + x + extents.right - image_x; - else - image_w = w - image_x; - if(physDev->dc_rect.top + y + extents.bottom < h) - image_h = physDev->dc_rect.top + y + extents.bottom - image_y; - else - image_h = h - image_y; - - if(image_w <= 0 || image_h <= 0) goto no_image; - - X11DRV_expect_error(gdi_display, XRenderErrorHandler, NULL); - image = XGetImage(gdi_display, physDev->drawable, - image_x, image_y, image_w, image_h, - AllPlanes, ZPixmap); - X11DRV_check_error(); - - TRACE("XGetImage(%p, %x, %d, %d, %d, %d, %lx, %x) depth = %d rets %p\n", - gdi_display, (int)physDev->drawable, image_x, image_y, - image_w, image_h, AllPlanes, ZPixmap, - physDev->depth, image); - if(!image) { - Pixmap xpm = XCreatePixmap(gdi_display, root_window, image_w, image_h, - physDev->depth); - GC gc; - XGCValues gcv; - - gcv.graphics_exposures = False; - gc = XCreateGC(gdi_display, xpm, GCGraphicsExposures, &gcv); - XCopyArea(gdi_display, physDev->drawable, xpm, gc, image_x, image_y, - image_w, image_h, 0, 0); - XFreeGC(gdi_display, gc); - X11DRV_expect_error(gdi_display, XRenderErrorHandler, NULL); - image = XGetImage(gdi_display, xpm, 0, 0, image_w, image_h, AllPlanes, - ZPixmap); - X11DRV_check_error(); - XFreePixmap(gdi_display, xpm); - } - if(!image) goto no_image; - - image->red_mask = visual->red_mask; - image->green_mask = visual->green_mask; - image->blue_mask = visual->blue_mask; - - offset = xoff = yoff = 0; - for(idx = 0; idx < count; idx++) { - SmoothGlyphGray(image, xoff + image_off_x - extents.left, - yoff + image_off_y - extents.top, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]], - physDev->textPixel); - if(lpDx) { - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } else { - xoff += formatEntry->gis[wstr[idx]].xOff; - yoff += formatEntry->gis[wstr[idx]].yOff; - } - } - XPutImage(gdi_display, physDev->drawable, physDev->gc, image, 0, 0, - image_x, image_y, image_w, image_h); - XDestroyImage(image); -#endif + { + offset.x += formatEntry->gis[wstr[idx]].xOff; + offset.y += formatEntry->gis[wstr[idx]].yOff; + } } -//no_image: //Cleanup the temporary pen EBRUSHOBJ_vCleanup(&pTextPen);

13 years, 10 months

[pschweitzer] 50612: [NTOSKRNL/PPC] Fix the fix, spotted by "ThFabba" on IRC

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 6 13:50:57 2011 New Revision: 50612 URL: http://svn.reactos.org/svn/reactos?rev=50612&view=rev Log: [NTOSKRNL/PPC] Fix the fix, spotted by "ThFabba" on IRC Modified: trunk/reactos/ntoskrnl/ke/powerpc/cpu.c Modified: trunk/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/cpu.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Sun Feb 6 13:50:57 2011 @@ -44,7 +44,7 @@ CPUID(IN ULONG CpuInfo[4], IN ULONG InfoType) { - RtlZeroMemory(CpuInfo, sizeof(CpuInfo) * sizeof(ULONG)); + RtlZeroMemory(CpuInfo, 4 * sizeof(ULONG)); } VOID

13 years, 10 months

[pschweitzer] 50611: [NTOSKRNL/PPC] Fix sizeof() wrong usage

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 6 13:05:45 2011 New Revision: 50611 URL: http://svn.reactos.org/svn/reactos?rev=50611&view=rev Log: [NTOSKRNL/PPC] Fix sizeof() wrong usage Modified: trunk/reactos/ntoskrnl/ke/powerpc/cpu.c Modified: trunk/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/cpu.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Sun Feb 6 13:05:45 2011 @@ -44,7 +44,7 @@ CPUID(IN ULONG CpuInfo[4], IN ULONG InfoType) { - RtlZeroMemory(CpuInfo, sizeof(CpuInfo)); + RtlZeroMemory(CpuInfo, sizeof(CpuInfo) * sizeof(ULONG)); } VOID

13 years, 10 months

[ekohl] 50610: [SETUPAPI] Implement CM_Is_Version_Available and CM_Is_Version_Available_Ex.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 5 21:58:19 2011 New Revision: 50610 URL: http://svn.reactos.org/svn/reactos?rev=50610&view=rev Log: [SETUPAPI] Implement CM_Is_Version_Available and CM_Is_Version_Available_Ex. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Feb 5 21:58:19 2011 @@ -2915,6 +2915,61 @@ RpcEndExcept; return ret; +} + + +/*********************************************************************** + * CM_Is_Version_Available_Ex [SETUPAPI.@] + */ +BOOL WINAPI CM_Is_Version_Available( + WORD wVersion) +{ + TRACE("%hu\n", wVersion); + return CM_Is_Version_Available_Ex(wVersion, NULL); +} + + +/*********************************************************************** + * CM_Is_Version_Available_Ex [SETUPAPI.@] + */ +BOOL WINAPI CM_Is_Version_Available_Ex( + WORD wVersion, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + WORD wServerVersion; + CONFIGRET ret; + + TRACE("%hu %lx\n", wVersion, hMachine); + + if (wVersion <= 0x400) + return TRUE; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return FALSE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return FALSE; + } + + RpcTryExcept + { + ret = PNP_GetVersion(BindingHandle, &wServerVersion); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret != CR_SUCCESS) + return FALSE; + + return (wServerVersion >= wVersion); } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Feb 5 21:58:19 2011 @@ -137,8 +137,8 @@ @ stub CM_Invert_Range_List @ stdcall CM_Is_Dock_Station_Present(ptr) @ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) -@ stub CM_Is_Version_Available -@ stub CM_Is_Version_Available_Ex +@ stdcall CM_Is_Version_Available(long) +@ stdcall CM_Is_Version_Available_Ex(long long) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long)

13 years, 10 months

[jgardou] 50609: [SYSSETUP] SC Manager needs SC_MANAGER_ENUMERATE_SERVICE access right to be able to open a service Add debug prints to help tracking down the "EnableUserModePnpManager()" issue

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Feb 5 16:00:11 2011 New Revision: 50609 URL: http://svn.reactos.org/svn/reactos?rev=50609&view=rev Log: [SYSSETUP] SC Manager needs SC_MANAGER_ENUMERATE_SERVICE access right to be able to open a service Add debug prints to help tracking down the "EnableUserModePnpManager()" issue Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Feb 5 16:00:11 2011 @@ -477,15 +477,21 @@ SC_HANDLE hService = NULL; BOOL ret = FALSE; - hSCManager = OpenSCManager(NULL, NULL, 0); + hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) + { + DPRINT1("Unable to open the service control manager.\n"); goto cleanup; + } hService = OpenServiceW(hSCManager, L"PlugPlay", SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) + { + DPRINT1("Unable to open PlugPlay service\n"); goto cleanup; + } ret = ChangeServiceConfigW(hService, SERVICE_NO_CHANGE, @@ -494,11 +500,17 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (!ret) + { + DPRINT1("Unable to change the service configuration\n"); goto cleanup; + } ret = StartServiceW(hService, 0, NULL); if (!ret) + { + DPRINT("Unable to start service\n"); goto cleanup; + } ret = TRUE;

13 years, 10 months

[fireball] 50608: - Merge 50604 by Timo.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Feb 5 10:30:07 2011 New Revision: 50608 URL: http://svn.reactos.org/svn/reactos?rev=50608&view=rev Log: - Merge 50604 by Timo. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Sat Feb 5 10:30:07 2011 @@ -252,64 +252,51 @@ FASTCALL InterlockedPopFreeEntry() { - ULONG idxFirst, idxNext, idxPrev; + ULONG iFirst, iNext, iPrev; PGDI_TABLE_ENTRY pEntry; - DWORD PrevProcId; DPRINT("Enter InterLockedPopFreeEntry\n"); - while (TRUE) - { - idxFirst = GdiHandleTable->FirstFree; - - if (!idxFirst) + do + { + /* Get the index and sequence number of the first free entry */ + iFirst = GdiHandleTable->FirstFree; + + /* Check if we have a free entry */ + if (!(iFirst & GDI_HANDLE_INDEX_MASK)) { /* Increment FirstUnused and get the new index */ - idxFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; - - /* Check if we have entries left */ - if (idxFirst >= GDI_HANDLE_COUNT) + iFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; + + /* Check if we have unused entries left */ + if (iFirst >= GDI_HANDLE_COUNT) { DPRINT1("No more gdi handles left!\n"); return 0; } /* Return the old index */ - return idxFirst; + return iFirst; } /* Get a pointer to the first free entry */ - pEntry = GdiHandleTable->Entries + idxFirst; - - /* Try to lock the entry */ - PrevProcId = InterlockedCompareExchange((LONG*)&pEntry->ProcessId, 1, 0); - if (PrevProcId != 0) - { - /* The entry was locked or not free, wait and start over */ - DelayExecution(); - continue; - } - - /* Sanity check: is entry really free? */ - ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + pEntry = GdiHandleTable->Entries + (iFirst & GDI_HANDLE_INDEX_MASK); + + /* Create a new value with an increased sequence number */ + iNext = (USHORT)(ULONG_PTR)pEntry->KernelData; + iNext |= (iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000; /* Try to exchange the FirstFree value */ - idxNext = (ULONG_PTR)pEntry->KernelData; - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxNext, - idxFirst); - - /* Unlock the free entry */ - (void)InterlockedExchange((LONG*)&pEntry->ProcessId, 0); - - /* If we succeeded, break out of the loop */ - if (idxPrev == idxFirst) - { - break; - } - } - - return idxFirst; + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iNext, + iFirst); + } + while (iPrev != iFirst); + + /* Sanity check: is entry really free? */ + ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + + return iFirst & GDI_HANDLE_INDEX_MASK; } /* Pushes an entry of the handle table to the free list, @@ -318,7 +305,7 @@ FASTCALL InterlockedPushFreeEntry(ULONG idxToFree) { - ULONG idxFirstFree, idxPrev; + ULONG iToFree, iFirst, iPrev; PGDI_TABLE_ENTRY pFreeEntry; DPRINT("Enter InterlockedPushFreeEntry\n"); @@ -326,18 +313,26 @@ pFreeEntry = GdiHandleTable->Entries + idxToFree; ASSERT((pFreeEntry->Type & GDI_ENTRY_BASETYPE_MASK) == 0); ASSERT(pFreeEntry->ProcessId == 0); - pFreeEntry->UserData = NULL; + pFreeEntry->UserData = NULL; // FIXME + ASSERT(pFreeEntry->UserData == NULL); do { - idxFirstFree = GdiHandleTable->FirstFree; - pFreeEntry->KernelData = (PVOID)(ULONG_PTR)idxFirstFree; - - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxToFree, - idxFirstFree); - } - while (idxPrev != idxFirstFree); + /* Get the current first free index and sequence number */ + iFirst = GdiHandleTable->FirstFree; + + /* Set the KernelData member to the index of the first free entry */ + pFreeEntry->KernelData = UlongToPtr(iFirst & GDI_HANDLE_INDEX_MASK); + + /* Combine new index and increased sequence number in iToFree */ + iToFree = idxToFree | ((iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000); + + /* Try to atomically update the first free entry */ + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iToFree, + iFirst); + } + while (iPrev != iFirst); }

13 years, 10 months

[tkreuzer] 50607: [NTOS] Try to fix a winetst crash.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 4 23:19:00 2011 New Revision: 50607 URL: http://svn.reactos.org/svn/reactos?rev=50607&view=rev Log: [NTOS] Try to fix a winetst crash. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Feb 4 23:19:00 2011 @@ -689,9 +689,6 @@ if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[i].VirtualAddress, pssSegments[i].Length)) DIE(("The image is larger than 4GB\n")); } - - /* spare our caller some work in validating the segments */ - *Flags = EXEFMT_LOAD_ASSUME_SEGMENTS_SORTED | EXEFMT_LOAD_ASSUME_SEGMENTS_NO_OVERLAP; if(nSectionAlignment >= PAGE_SIZE) *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED;

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011