Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[gschneider] 40510: - ICON_CreateCursorFromData should pass a header that fits to the bitmap data to SetDIBits to allow color conversion if necessary; create the color cursor if requested in the same function - Winamp 2.95 now shows a custom cursor, but it's still surrounded by blackness, bug #4370 - Misc typo fixes, cleanup

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Apr 15 01:30:03 2009 New Revision: 40510 URL: http://svn.reactos.org/svn/reactos?rev=40510&view=rev Log: - ICON_CreateCursorFromData should pass a header that fits to the bitmap data to SetDIBits to allow color conversion if necessary; create the color cursor if requested in the same function - Winamp 2.95 now shows a custom cursor, but it's still surrounded by blackness, bug #4370 - Misc typo fixes, cleanup Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Wed Apr 15 01:30:03 2009 @@ -56,8 +56,7 @@ #include "poppack.h" -/*forward declerations... actualy in user32\windows\icon.c but usful here****/ -HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); +/* forward declerations... actually in user32\windows\icon.c but usful here */ HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width, int height, int colors); CURSORICONDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir, int width, int height, int colors); Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 01:30:03 2009 @@ -94,9 +94,9 @@ HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot) { - /* FIXME - color cursors */ BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; + BITMAPINFO *orgBIH = (BITMAPINFO *)IconImage; ICONINFO IconInfo; PVOID XORImageData = ImageData; @@ -104,7 +104,7 @@ IconInfo.xHotspot = xHotspot; IconInfo.yHotspot = yHotspot; - /* Create a BITMAPINFO header for the monocrome part of the icon */ + /* Create a BITMAPINFO header for the monochrome part of the icon */ bwBIH->bmiHeader.biBitCount = 1; bwBIH->bmiHeader.biWidth = IconImage->icHeader.biWidth; bwBIH->bmiHeader.biHeight = IconImage->icHeader.biHeight; @@ -133,10 +133,24 @@ if (IconInfo.hbmMask) { SetDIBits(hDC, IconInfo.hbmMask, 0, IconImage->icHeader.biHeight, - XORImageData, bwBIH, DIB_RGB_COLORS); + XORImageData, orgBIH, DIB_RGB_COLORS); } - IconInfo.hbmColor = (HBITMAP)0; + if (IconImage->icHeader.biBitCount == 1) + { + IconInfo.hbmColor = (HBITMAP)0; + } + else + { + /* Create the color part of the icon */ + IconInfo.hbmColor = CreateDIBitmap(hDC, &IconImage->icHeader, 0, + XORImageData, orgBIH, DIB_RGB_COLORS); + if (IconInfo.hbmColor) + { + SetDIBits(hDC, IconInfo.hbmColor, 0, IconImage->icHeader.biHeight, + XORImageData, orgBIH, DIB_RGB_COLORS); + } + } /* Create the icon based on everything we have so far */ return NtUserCreateCursorIconHandle(&IconInfo, FALSE);

15 years, 9 months

[tkreuzer] 40509: Remove hBitmap from DC.rosdc and use DC.dclevel.pSurface instead.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 15 00:50:02 2009 New Revision: 40509 URL: http://svn.reactos.org/svn/reactos?rev=40509&view=rev Log: Remove hBitmap from DC.rosdc and use DC.dclevel.pSurface instead. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -17,7 +17,6 @@ HRGN hClipRgn; /* Clip region (may be 0) */ HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HBITMAP hBitmap; BYTE bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -89,7 +89,6 @@ PSYSTEM_CURSORINFO CurInfo; PCURICON_OBJECT OldCursor; HCURSOR Ret = (HCURSOR)0; - HBITMAP dcbmp; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -120,13 +119,14 @@ { return Ret; } - dcbmp = dc->rosdc.hBitmap; DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; - DC_UnlockDc(dc); - - psurf = SURFACE_LockSurface(dcbmp); + + psurf = dc->dclevel.pSurface; if (!psurf) + { + DC_UnlockDc(dc); return (HCURSOR)0; + } pso = &psurf->SurfObj; if (!NewCursor) @@ -148,7 +148,7 @@ CurInfo->ShowingCursor = 0; } - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return Ret; } @@ -162,7 +162,7 @@ if (maskBpp != 1) { DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return Ret; } @@ -207,7 +207,7 @@ if ( !hMask ) { SURFACE_UnlockSurface(MaskBmpObj); - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return (HCURSOR)0; } soMask = EngLockSurface((HSURF)hMask); @@ -249,7 +249,6 @@ DPRINT1("IntEngSetPointerShape returned %lx\n", Status); } - SURFACE_UnlockSurface(psurf); if(hMask) { EngUnlockSurface(soMask); @@ -260,6 +259,7 @@ EngDeleteXlate(XlateObj); } + DC_UnlockDc(dc); return Ret; } @@ -1724,7 +1724,6 @@ HDC Screen; PDC dc; - HBITMAP hbmpDc; SURFOBJ *SurfObj; SURFACE *psurfDc; PDEVOBJ *ppdev; @@ -1743,19 +1742,18 @@ return showpointer; /* No mouse */ } - hbmpDc = dc->rosdc.hBitmap; - DC_UnlockDc(dc); - - psurfDc = SURFACE_LockSurface(hbmpDc); + psurfDc = dc->dclevel.pSurface; + if ( !psurfDc ) { + DC_UnlockDc(dc); return showpointer; /* No Mouse */ } SurfObj = &psurfDc->SurfObj; if (SurfObj == NULL) { - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; /* No mouse */ } @@ -1763,7 +1761,7 @@ if(ppdev == NULL) { - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; /* No mouse */ } @@ -1800,6 +1798,6 @@ } } - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -432,12 +432,11 @@ SURFACE *psurf; dc = DC_LockDc(ScreenDeviceContext); /* FIXME - Handle dc == NULL!!!! */ - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); - if(psurf) + psurf = dc->dclevel.pSurface; + if (psurf) { Ret->right = psurf->SurfObj.sizlBitmap.cx; Ret->bottom = psurf->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurf); } DC_UnlockDc(dc); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -1072,7 +1072,6 @@ PWINSTATION_OBJECT WinSta; BOOL DoMove, SwapButtons; MSG Msg; - HBITMAP hBitmap; SURFACE *psurf; SURFOBJ *pso; PDC dc; @@ -1169,10 +1168,7 @@ dc = DC_LockDc(hDC); if (dc) { - hBitmap = dc->rosdc.hBitmap; - DC_UnlockDc(dc); - - psurf = SURFACE_LockSurface(hBitmap); + psurf = dc->dclevel.pSurface; if (psurf) { pso = &psurf->SurfObj; @@ -1185,9 +1181,9 @@ * use the old values to move the pointer image */ gpsi->ptCursor.x = MousePos.x; gpsi->ptCursor.y = MousePos.y; - - SURFACE_UnlockSurface(psurf); - } + } + + DC_UnlockDc(dc); } } Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -156,7 +156,7 @@ arctype, pbrushPen); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (NULL == psurf) { DPRINT1("Arc Fail 2\n"); @@ -174,7 +174,6 @@ PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); pbrushPen->ptPenWidth.x = PenOrigWidth; - SURFACE_UnlockSurface(psurf); PEN_UnlockPen(pbrushPen); DPRINT("IntArc Exit.\n"); return ret; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -120,7 +120,7 @@ } /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) { if (hDCSrc != hDCDest) @@ -128,14 +128,11 @@ DC_UnlockDc(DCDest); return FALSE; } - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - BitmapSrc = BitmapDest; - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + + { + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) { - SURFACE_UnlockSurface(BitmapDest); if (hDCSrc != hDCDest) DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -164,9 +161,6 @@ if (XlateObj != NULL) EngDeleteXlate(XlateObj); - SURFACE_UnlockSurface(BitmapDest); - if (BitmapSrc != BitmapDest) - SURFACE_UnlockSurface(BitmapSrc); DC_UnlockDc(DCDest); if (hDCSrc != hDCDest) DC_UnlockDc(DCSrc); @@ -264,17 +258,14 @@ } /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) goto cleanup; if (UsesSource) { - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - BitmapSrc = BitmapDest; - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + { + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) goto cleanup; } @@ -311,14 +302,6 @@ if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); - if(BitmapDest != NULL) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - SURFACE_UnlockSurface(BitmapSrc); - } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -387,13 +370,13 @@ return TRUE; } - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) { goto done; } - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) { goto done; @@ -466,14 +449,6 @@ done: DC_UnlockDc(DCSrc); - if (BitmapDest) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapSrc) - { - SURFACE_UnlockSurface(BitmapSrc); - } if(hdcDst != hdcSrc) { DC_UnlockDc(DCDest); @@ -826,18 +801,13 @@ BrushOrigin.y = 0; /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (BitmapDest == NULL) goto failed; if (UsesSource) { - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - { - BitmapSrc = BitmapDest; - } - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + { + BitmapSrc = DCSrc->dclevel.pSurface; if (BitmapSrc == NULL) goto failed; } @@ -862,7 +832,7 @@ DCMask = DC_LockDc(hDCMask); if (DCMask) { - BitmapMask = SURFACE_LockSurface(DCMask->rosdc.hBitmap); + BitmapMask = DCMask->dclevel.pSurface; if (BitmapMask && (BitmapMask->SurfObj.sizlBitmap.cx != WidthSrc || BitmapMask->SurfObj.sizlBitmap.cy != HeightSrc)) @@ -890,18 +860,6 @@ if (XlateObj) { EngDeleteXlate(XlateObj); - } - if (BitmapSrc && DCSrc->rosdc.hBitmap != DCDest->rosdc.hBitmap) - { - SURFACE_UnlockSurface(BitmapSrc); - } - if (BitmapDest) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapMask) - { - SURFACE_UnlockSurface(BitmapMask); } if (UsesSource && hDCSrc != hDCDest) { @@ -967,7 +925,7 @@ ASSERT(BrushObj); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1023,8 +981,6 @@ &BrushOrigin, ROP3_TO_ROP4(ROP)); } - - SURFACE_UnlockSurface(psurf); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -154,7 +154,7 @@ { DIBSECTION dibs; INT Count; - PSURFACE psurf = SURFACE_LockSurface(Dc->rosdc.hBitmap); + PSURFACE psurf = Dc->dclevel.pSurface; Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); if (Count) @@ -223,7 +223,6 @@ if (!PalGDI) { ExFreePoolWithTag(bi, TAG_TEMP); - SURFACE_UnlockSurface(psurf); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } @@ -239,7 +238,6 @@ } PALETTE_UnlockPalette(PalGDI); } - SURFACE_UnlockSurface(psurf); Bmp = DIB_CreateDIBSection(Dc, bi, @@ -254,7 +252,6 @@ } } } - SURFACE_UnlockSurface(psurf); } } return Bmp; @@ -361,7 +358,7 @@ if (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos)) { bInRect = TRUE; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; pso = &psurf->SurfObj; if (psurf) { @@ -381,7 +378,6 @@ } EngDeleteXlate(XlateObj); } - SURFACE_UnlockSurface(psurf); } } DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -212,6 +212,7 @@ HRGN hVisRgn; UNICODE_STRING StdDriver; BOOL calledFromUser; + HSURF hsurf; RtlInitUnicodeString(&StdDriver, L"DISPLAY"); @@ -284,7 +285,9 @@ pdc->dhpdev = PrimarySurface.hPDev; if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device. pdc->ppdev = (PVOID)&PrimarySurface; - pdc->rosdc.hBitmap = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? + hsurf = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? + pdc->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); + // ATM we only have one display. pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; @@ -574,6 +577,7 @@ HRGN hVisRgn; UNICODE_STRING DriverName; DWORD Layout = 0; + HSURF hsurf; if (hDC == NULL) { @@ -628,7 +632,8 @@ pdcattrNew->szlViewportExt = pdcattrOld->szlViewportExt; pdcNew->dctype = DC_TYPE_MEMORY; // Always! - pdcNew->rosdc.hBitmap = NtGdiGetStockObject(DEFAULT_BITMAP); + hsurf = NtGdiGetStockObject(DEFAULT_BITMAP); + pdcNew->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); pdcNew->ppdev = pdcOld->ppdev; pdcNew->dclevel.hpal = pdcOld->dclevel.hpal; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -20,11 +20,10 @@ XLATEOBJ *pxlo = NULL; HPALETTE hPalette = NULL; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hPalette = psurf->hDIBPalette; - SURFACE_UnlockSurface(psurf); } if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; @@ -185,14 +184,12 @@ SURFACE *psurf; HPALETTE hpal; -// psurf = pdc->dclevel.pSurface; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hpal = psurf->hDIBPalette; if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; pxlo = IntEngCreateXlate(0, PAL_RGB, hpal, NULL); - SURFACE_UnlockSurface(psurf); } /* Update the eboText's solid color */ @@ -216,14 +213,12 @@ SURFACE *psurf; HPALETTE hpal; -// psurf = pdc->dclevel.pSurface; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hpal = psurf->hDIBPalette; if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; pxlo = IntEngCreateXlate(0, PAL_RGB, hpal, NULL); - SURFACE_UnlockSurface(psurf); } /* Update the eboBackground's solid color */ @@ -386,11 +381,6 @@ psurfOld = pDC->dclevel.pSurface; hOrgBmp = psurfOld ? psurfOld->BaseObject.hHmgr : NULL; - /* FIXME: ros hack */ - hOrgBmp = pDC->rosdc.hBitmap; - - pDC->rosdc.hBitmap = hBmp; - /* Release the old bitmap, reference the new */ DC_vSelectSurface(pDC, psurfBmp); @@ -530,8 +520,11 @@ break; case GDI_OBJECT_TYPE_BITMAP: - SelObject = pdc->rosdc.hBitmap; - break; + { + SURFACE *psurf = pdc->dclevel.pSurface; + SelObject = psurf ? psurf->BaseObject.hHmgr : NULL; + break; + } case GDI_OBJECT_TYPE_COLORSPACE: DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_COLORSPACE not supported yet!\n"); Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -48,8 +48,6 @@ pdcDst->dclevel.plfnt = pdcSrc->dclevel.plfnt; /* ROS hacks */ - pdcDst->rosdc.hBitmap = pdcSrc->rosdc.hBitmap; - if (pdcDst->dctype != DC_TYPE_MEMORY) { pdcDst->rosdc.bitsPerPixel = pdcSrc->rosdc.bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -85,7 +85,7 @@ return 0; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { DC_UnlockDc(dc); @@ -95,7 +95,6 @@ if (psurf->hSecure == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -110,7 +109,6 @@ PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; @@ -132,7 +130,6 @@ /* Mark the brushes invalid */ dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return Entries; @@ -154,7 +151,7 @@ return 0; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { DC_UnlockDc(dc); @@ -164,7 +161,6 @@ if (psurf->hSecure == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -180,7 +176,6 @@ PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; @@ -200,7 +195,6 @@ else Entries = 0; - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return Entries; @@ -484,14 +478,13 @@ DDBPalette = pDC->ppdev->DevInfo.hpalDefault; /* Try to use hDIBPalette if it exists */ - pSurf = SURFACE_LockSurface(pDC->rosdc.hBitmap); + pSurf = pDC->dclevel.pSurface; if (pSurf && pSurf->hDIBPalette) { DDBPalette = pSurf->hDIBPalette; - SURFACE_UnlockSurface(pSurf); - } - - pDestSurf = EngLockSurface((HSURF)pDC->rosdc.hBitmap); + } + + pDestSurf = pSurf ? &pSurf->SurfObj : NULL; rcDest.left = XDest; rcDest.top = YDest; @@ -582,7 +575,6 @@ if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); if (XlateObj) EngDeleteXlate(XlateObj); if (DIBPalette) PALETTE_FreePaletteByHandle(DIBPalette); - EngUnlockSurface(pDestSurf); DC_UnlockDc(pDC); return ret; @@ -1257,7 +1249,7 @@ { DIBSECTION dibs; INT Count; - SURFACE *psurf = SURFACE_LockSurface(Dc->rosdc.hBitmap); + SURFACE *psurf = Dc->dclevel.pSurface; Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); if (!Count) bpp = 1; @@ -1270,7 +1262,6 @@ /* A DIB section is selected in the DC */ bpp = dibs.dsBmih.biBitCount; } - SURFACE_UnlockSurface(psurf); } } Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -1198,7 +1198,7 @@ ASSERT(pbrush); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1249,7 +1249,6 @@ ROP3_TO_ROP4(ROP)); } - SURFACE_UnlockSurface(psurf); return (int)Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -96,7 +96,7 @@ /* Special locking order to avoid lock-ups */ pbrFill = dc->dclevel.pbrFill; pbrLine = dc->dclevel.pbrLine; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!!! don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -153,7 +153,6 @@ } } } - SURFACE_UnlockSurface(psurf); return ret; } @@ -581,7 +580,7 @@ ret = FALSE; goto cleanup; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { ret = FALSE; @@ -646,9 +645,6 @@ } cleanup: - if (psurf) - SURFACE_UnlockSurface(psurf); - /* Move current position in DC? MSDN: The current position is neither used nor updated by Rectangle. */ @@ -917,7 +913,7 @@ DitherOrg.x += dc->ptlDCOrig.x; DitherOrg.y += dc->ptlDCOrig.y; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -947,7 +943,6 @@ &DitherOrg, ulMode); - SURFACE_UnlockSurface(psurf); EngDeleteXlate(XlateObj); return Ret; @@ -1121,7 +1116,7 @@ Ret = FALSE; goto cleanup; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { Ret = FALSE; @@ -1129,9 +1124,6 @@ } cleanup: - if (psurf) - SURFACE_UnlockSurface(psurf); - DC_UnlockDc(dc); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -3171,7 +3171,7 @@ IntLPtoDP(dc, (POINT *)lprc, 2); } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { goto fail; @@ -3579,7 +3579,6 @@ EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj2); - SURFACE_UnlockSurface(psurf); if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); good: @@ -3594,8 +3593,6 @@ EngDeleteXlate(XlateObj); if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); - if (psurf != NULL) - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -113,7 +113,7 @@ if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); - psurf = SURFACE_LockSurface( dc->rosdc.hBitmap ); + psurf = dc->dclevel.pSurface; if (NULL == psurf) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -153,7 +153,6 @@ ROP2_TO_MIX(pdcattr->jROP2)); } - SURFACE_UnlockSurface(psurf); } if (Ret) @@ -263,7 +262,7 @@ Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD); if (Points != NULL) { - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -285,7 +284,6 @@ Count, ROP2_TO_MIX(pdcattr->jROP2)); - SURFACE_UnlockSurface(psurf); EngFreeMem(Points); } else Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -114,7 +114,7 @@ INT OutSize, LPSTR OutData) { - SURFACE *psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + SURFACE *psurf = dc->dclevel.pSurface; INT Result; /* FIXME - Handle psurf == NULL !!!!!! */ @@ -139,7 +139,6 @@ OutSize, (PVOID)OutData ); } - SURFACE_UnlockSurface(psurf); return Result; } Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -2936,7 +2936,7 @@ BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - Handle psurf == NULL !!!! */ bRet = IntEngPaint(&psurf->SurfObj, @@ -2945,7 +2945,6 @@ &BrushOrigin, 0xFFFF);//FIXME:don't know what to put here - SURFACE_UnlockSurface(psurf); REGION_UnlockRgn(visrgn); GreDeleteObject(tmpVisRgn);

15 years, 9 months

[tkreuzer] 40508: Revert 40507, it breaks VBox.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 14 22:14:18 2009 New Revision: 40508 URL: http://svn.reactos.org/svn/reactos?rev=40508&view=rev Log: Revert 40507, it breaks VBox. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Apr 14 22:14:18 2009 @@ -809,13 +809,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; UniATA/Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 +; Atapi miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Apr 14 22:14:18 2009 @@ -13,7 +13,7 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 -uniata.sys=,,,,,,x,,,,,,4 +atapi.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,4 @@ -31,6 +31,7 @@ ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4050… ============================================================================== Binary files - no diff available.

15 years, 9 months

[dreimer] 40507: Enable uniata.sys as default Storage driver. Approved by Fireball. Complaints go to reimer.daniel@freenet.de I skipped removing atapi.sys from build. first test it. if it works we do this then.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Apr 14 21:24:04 2009 New Revision: 40507 URL: http://svn.reactos.org/svn/reactos?rev=40507&view=rev Log: Enable uniata.sys as default Storage driver. Approved by Fireball. Complaints go to reimer.daniel(a)freenet.de I skipped removing atapi.sys from build. first test it. if it works we do this then. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Apr 14 21:24:04 2009 @@ -809,13 +809,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 +; UniATA/Atapi miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Apr 14 21:24:04 2009 @@ -13,7 +13,7 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 -atapi.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,4 @@ -31,7 +31,6 @@ ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4050… ============================================================================== Binary files - no diff available.

15 years, 9 months

[fireball] 40506: - Display unpartitioned and unformatted entries in a partition table. Fixes problems when installing on an absolutely clean harddisk.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 14 20:53:22 2009 New Revision: 40506 URL: http://svn.reactos.org/svn/reactos?rev=40506&view=rev Log: - Display unpartitioned and unformatted entries in a partition table. Fixes problems when installing on an absolutely clean harddisk. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Apr 14 20:53:22 2009 @@ -1362,7 +1362,8 @@ /* Print disk entry */ for (i=0; i<4; i++) { - if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED) + if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED || + PartEntry->PartInfo[i].PartitionLength.QuadPart != 0ULL) { PrintPartitionData (List, DiskEntry, @@ -1370,6 +1371,16 @@ i); } } + + /* Print unpartitioned entry */ + if (PartEntry->Unpartitioned || PartEntry->New) + { + PrintPartitionData (List, + DiskEntry, + PartEntry, + 0); + } + } /* Print separator line */

15 years, 9 months

[janderwald] 40505: - Implement Channel de-muxing - WIP, bugs expected

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Apr 14 20:43:17 2009 New Revision: 40505 URL: http://svn.reactos.org/svn/reactos?rev=40505&view=rev Log: - Implement Channel de-muxing - WIP, bugs expected Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Tue Apr 14 20:43:17 2009 @@ -9,6 +9,127 @@ #include "kmixer.h" const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; + +NTSTATUS +PerformChannelConversion( + PUCHAR Buffer, + ULONG BufferLength, + ULONG OldChannels, + ULONG NewChannels, + ULONG BitsPerSample, + PVOID * Result, + PULONG ResultLength) +{ + ULONG Samples; + ULONG NewIndex, OldIndex; + + Samples = BufferLength / (BitsPerSample / 8) / OldChannels; + + if (NewChannels > OldChannels) + { + if (BitsPerSample == 8) + { + PUCHAR BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(UCHAR)); + + do + { + /* 2 channel stretched to 4 looks like LRLR */ + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 16) + { + PUSHORT BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(USHORT)); + + do + { + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 24) + { + PUCHAR BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * 3); + + do + { + RtlMoveMemory(&BufferOut[(NewIndex+OldChannels + SubIndex) * 3], &Buffer[(OldIndex + (SubIndex % OldChannels)) * 3], 3); + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 32) + { + PULONG BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(ULONG)); + + do + { + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + + } + else + { + PUSHORT BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + /* TODO + * mix stream instead of just dumping part of it ;) + */ + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], NewChannels * (BitsPerSample/8)); + } + + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + return STATUS_SUCCESS; +} + NTSTATUS PerformQualityConversion( @@ -359,7 +480,6 @@ InputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.wBitsPerSample); - if (InputFormat->WaveFormatEx.wBitsPerSample != OutputFormat->WaveFormatEx.wBitsPerSample) { Status = PerformQualityConversion(StreamHeader->Data, @@ -370,7 +490,24 @@ &BufferLength); if (NT_SUCCESS(Status)) { - //DPRINT1("Old BufferSize %u NewBufferSize %u\n", StreamHeader->DataUsed, BufferLength); + ExFreePool(StreamHeader->Data); + StreamHeader->Data = BufferOut; + StreamHeader->DataUsed = BufferLength; + } + } + + if (InputFormat->WaveFormatEx.nChannels != OutputFormat->WaveFormatEx.nChannels) + { + Status = PerformChannelConversion(StreamHeader->Data, + StreamHeader->DataUsed, + InputFormat->WaveFormatEx.nChannels, + OutputFormat->WaveFormatEx.nChannels, + InputFormat->WaveFormatEx.wBitsPerSample, + &BufferOut, + &BufferLength); + + if (NT_SUCCESS(Status)) + { ExFreePool(StreamHeader->Data); StreamHeader->Data = BufferOut; StreamHeader->DataUsed = BufferLength;

15 years, 9 months

[tkreuzer] 40504: Make the SURFACE structure more like the one from Windows

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 14 20:41:48 2009 New Revision: 40504 URL: http://svn.reactos.org/svn/reactos?rev=40504&view=rev Log: Make the SURFACE structure more like the one from Windows Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Tue Apr 14 20:41:48 2009 @@ -12,20 +12,33 @@ SURFOBJ SurfObj; FLONG flHooks; FLONG flFlags; - SIZE dimension; /* For SetBitmapDimension(), do NOT use + struct _PALETTE *ppal; + + union + { + HANDLE hSecureUMPD; // if UMPD_SURFACE set + HANDLE hMirrorParent;// if MIRROR_SURFACE set + HANDLE hDDSurface; // if DIRECTDRAW_SURFACE set + }; + + SIZEL dimension; /* For SetBitmapDimension(), do NOT use to get width/height of bitmap, use bitmap.bmWidth/bitmap.bmHeight for that */ - PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch - the actual bits in the bitmap */ + + HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. + ULONG cRef; // 0x064 + HPALETTE hpalHint; /* For device-independent bitmaps: */ HANDLE hDIBSection; HANDLE hSecure; DWORD dwOffset; + /* reactos specific */ + PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch + the actual bits in the bitmap */ HPALETTE hDIBPalette; - HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. DWORD dsBitfields[3]; // hack, should probably use palette instead DWORD biClrUsed; DWORD biClrImportant;

15 years, 9 months

[tkreuzer] 40503: Fix some parameter sizes in gdi32.spec (handles are pointer sized), there's probably a lot more.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 14 20:16:18 2009 New Revision: 40503 URL: http://svn.reactos.org/svn/reactos?rev=40503&view=rev Log: Fix some parameter sizes in gdi32.spec (handles are pointer sized), there's probably a lot more. Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Tue Apr 14 20:16:18 2009 @@ -1,12 +1,12 @@ -@ stdcall AbortDoc(long) -@ stdcall AbortPath(long) +@ stdcall AbortDoc(ptr) +@ stdcall AbortPath(ptr) @ stdcall AddFontMemResourceEx(ptr long ptr ptr) @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr) @ stdcall AddFontResourceTracking(str long) @ stdcall AddFontResourceW(wstr) -@ stdcall AngleArc(long long long long long long) +@ stdcall AngleArc(ptr long long long long long) @ stdcall AnimatePalette(long long long ptr) @ stdcall AnyLinkedFonts() NtGdiAnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @@ -360,8 +360,8 @@ @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) -@ stdcall GetDCBrushColor(long) -@ stdcall GetDCOrgEx(long ptr) +@ stdcall GetDCBrushColor(ptr) +@ stdcall GetDCOrgEx(ptr ptr) @ stdcall GetDCPenColor(long) @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long)

15 years, 9 months

[tkreuzer] 40502: Return NULL, if failed to lock the provided palette in InrEngCreateXlate. Fixes bug 4378. See issue #4378 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 14 20:06:07 2009 New Revision: 40502 URL: http://svn.reactos.org/svn/reactos?rev=40502&view=rev Log: Return NULL, if failed to lock the provided palette in InrEngCreateXlate. Fixes bug 4378. See issue #4378 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Tue Apr 14 20:06:07 2009 @@ -177,9 +177,23 @@ DestPalGDI = PALETTE_LockPalette(PaletteDest); if (SourcePalType == 0) + { + if (!SourcePalGDI) + { + DPRINT1("Failed to lock source palette %p\n", PaletteSource); + return NULL; + } SourcePalType = SourcePalGDI->Mode; + } if (DestPalType == 0) + { + if (!DestPalGDI) + { + DPRINT1("Failed to lock dest palette %p\n", PaletteDest); + return NULL; + } DestPalType = DestPalGDI->Mode; + } XlateObj->iSrcType = SourcePalType; XlateObj->iDstType = DestPalType;

15 years, 9 months

[gschneider] 40501: - Replace ConvertStringSecurityDescriptorToSecurityDescriptorW with the more advanced wine version, fixes a memory corruption advapi32 security winetest caused and the correspondent user mode crash (requested by Christoph_vW) - Update and move helper functions, remove unreferenced functions - Update readme.wine for advapi32 security files (we use a different structure and only parts of wine's implementation)

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Apr 14 19:36:39 2009 New Revision: 40501 URL: http://svn.reactos.org/svn/reactos?rev=40501&view=rev Log: - Replace ConvertStringSecurityDescriptorToSecurityDescriptorW with the more advanced wine version, fixes a memory corruption advapi32 security winetest caused and the correspondent user mode crash (requested by Christoph_vW) - Update and move helper functions, remove unreferenced functions - Update readme.wine for advapi32 security files (we use a different structure and only parts of wine's implementation) Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Apr 14 19:36:39 2009 @@ -303,370 +303,6 @@ return !status; } -static BOOL -FindKeyInTable( - IN const RECORD* Table, - IN LPCWSTR Key, - OUT SIZE_T* pKeyLength, - OUT DWORD* pItem) -{ - const RECORD* pRecord = Table; - while (pRecord->key != NULL) - { - if (wcsncmp(pRecord->key, Key, wcslen(pRecord->key)) == 0) - { - *pKeyLength = wcslen(pRecord->key); - *pItem = pRecord->value; - return TRUE; - } - pRecord++; - } - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; -} - -static BOOL -ParseSidString( - IN LPCWSTR Buffer, - OUT PSID* pSid, - OUT SIZE_T* pLength) -{ - WCHAR str[SDDL_ALIAS_SIZE + 1]; - LPWSTR strSid; - LPCWSTR end; - BOOL ret; - DWORD i; - - wcsncpy(str, Buffer, SDDL_ALIAS_SIZE); - for (i = SDDL_ALIAS_SIZE; i > 0; i--) - { - str[i] = UNICODE_NULL; - if (ConvertStringSidToSidW(str, pSid)) - { - *pLength = i; - return TRUE; - } - } - - end = wcschr(Buffer, SDDL_ACE_ENDC); - if (!end) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - strSid = (LPWSTR)LocalAlloc(0, (end - Buffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!strSid) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - wcsncpy(strSid, Buffer, end - Buffer + 1); - strSid[end - Buffer] = UNICODE_NULL; - *pLength = end - Buffer; - ret = ConvertStringSidToSidW(strSid, pSid); - LocalFree(strSid); - return ret; -} - -static const RECORD DaclFlagTable[] = -{ - { SDDL_PROTECTED, SE_DACL_PROTECTED }, - { SDDL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ }, - { SDDL_AUTO_INHERITED, SE_DACL_AUTO_INHERITED }, - { NULL, 0 }, -}; - -static const RECORD SaclFlagTable[] = -{ - { SDDL_PROTECTED, SE_SACL_PROTECTED }, - { SDDL_AUTO_INHERIT_REQ, SE_SACL_AUTO_INHERIT_REQ }, - { SDDL_AUTO_INHERITED, SE_SACL_AUTO_INHERITED }, - { NULL, 0 }, -}; - -static const RECORD AceFlagTable[] = -{ - { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, - { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, - { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, - { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, - { SDDL_INHERITED, INHERITED_ACE }, - { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, - { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, - { NULL, 0 }, -}; - -static BOOL -ParseFlagsString( - IN LPCWSTR Buffer, - IN const RECORD* FlagTable, - IN WCHAR LimitChar, - OUT DWORD* pFlags, - OUT SIZE_T* pLength) -{ - LPCWSTR ptr = Buffer; - SIZE_T PartialLength; - DWORD Flag; - - *pFlags = 0; - while (*ptr != LimitChar) - { - if (!FindKeyInTable(FlagTable, ptr, &PartialLength, &Flag)) - return FALSE; - *pFlags |= Flag; - ptr += PartialLength; - } - *pLength = ptr - Buffer; - return TRUE; -} - -static const RECORD AccessMaskTable[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP }, - { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP }, - { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD }, - { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD }, - { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST }, - { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF }, - { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT }, - { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE }, - { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS }, - { SDDL_FILE_ALL, FILE_ALL_ACCESS }, - { SDDL_FILE_READ, FILE_GENERIC_READ }, - { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, - { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, - { SDDL_KEY_ALL, KEY_ALL_ACCESS }, - { SDDL_KEY_READ, KEY_READ }, - { SDDL_KEY_WRITE, KEY_WRITE }, - { SDDL_KEY_EXECUTE, KEY_EXECUTE }, - { NULL, 0 }, -}; - -static BOOL -ParseAccessMaskString( - IN LPCWSTR Buffer, - OUT DWORD* pAccessMask, - OUT SIZE_T* pLength) -{ - LPCWSTR szAcl = Buffer; - BOOL RetVal = FALSE; - LPCWSTR ptr; - - if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) - { - LPCWSTR p = szAcl; - - while (*p && *p != ';') - p++; - - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - *pAccessMask = strtoulW(szAcl, NULL, 16); - ptr = wcschr(Buffer, SDDL_SEPERATORC); - if (ptr) - { - *pLength = ptr - Buffer; - RetVal = TRUE; - } - } - } - else - { - RetVal = ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); - } - - return RetVal; - } - -static BOOL -ParseGuidString( - IN LPCWSTR Buffer, - OUT GUID* pGuid, - OUT BOOL* pIsGuidValid, - OUT SIZE_T* pLength) -{ - WCHAR GuidStr[MAX_GUID_STRING_LEN + 1]; - LPCWSTR end; - - end = wcschr(Buffer, SDDL_SEPERATORC); - if (!end) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - *pLength = end - Buffer; - *pIsGuidValid = (end != Buffer); - if (!*pIsGuidValid) - return TRUE; - - if (end - Buffer > MAX_GUID_STRING_LEN - 1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - GuidStr[end - Buffer] = UNICODE_NULL; - wcsncpy(GuidStr, Buffer, end - Buffer); - if (RPC_S_OK != UuidFromStringW((unsigned short*)&GuidStr, pGuid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; -} - -static const RECORD AceTypeTable[] = -{ - { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, - { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, - { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, - { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, - { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, - { NULL, 0 }, -}; - -static BOOL -ParseAceString( - IN LPCWSTR Buffer, - IN PACL pAcl, - OUT SIZE_T* pLength) -{ - LPCWSTR ptr = Buffer; - SIZE_T PartialLength; - DWORD aceType, aceFlags, accessMask; - GUID object, inheritObject; - BOOL objectValid, inheritObjectValid; - PSID sid = NULL; - BOOL ret; - - if (*ptr != SDDL_ACE_BEGINC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_ACE_BEGINC */ - - if (!FindKeyInTable(AceTypeTable, ptr, &PartialLength, &aceType)) - return FALSE; - ptr += PartialLength; - - if (*ptr != SDDL_SEPERATORC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_SEPERATORC */ - - if (!ParseFlagsString(ptr, AceFlagTable, SDDL_SEPERATORC, &aceFlags, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseAccessMaskString(ptr, &accessMask, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseGuidString(ptr, &object, &objectValid, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseGuidString(ptr, &inheritObject, &inheritObjectValid, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseSidString(ptr, &sid, &PartialLength)) - return FALSE; - ptr += PartialLength; - if (*ptr != SDDL_ACE_ENDC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_ACE_ENDC */ - *pLength = ptr - Buffer; - - switch (aceType) - { - case ACCESS_ALLOWED_ACE_TYPE: - ret = AddAccessAllowedAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid); - break; - case ACCESS_ALLOWED_OBJECT_ACE_TYPE: - ret = AddAccessAllowedObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid); - break; - case ACCESS_DENIED_ACE_TYPE: - ret = AddAccessDeniedAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid); - break; - case ACCESS_DENIED_OBJECT_ACE_TYPE: - ret = AddAccessDeniedObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid); - break; - case SYSTEM_AUDIT_ACE_TYPE: - ret = AddAuditAccessAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid, - FALSE, - FALSE); - break; - case SYSTEM_AUDIT_OBJECT_ACE_TYPE: - ret = AddAuditAccessObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid, - FALSE, - FALSE); - break; - case SYSTEM_ALARM_ACE_TYPE: - case SYSTEM_ALARM_OBJECT_ACE_TYPE: - default: - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - ret = FALSE; - } - } - LocalFree(sid); - return ret; -} - /* Exported functions */ /* @@ -1122,573 +758,6 @@ } } -/****************************************************************************** - * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] - * @implemented - */ -BOOL WINAPI -ConvertStringSecurityDescriptorToSecurityDescriptorW( - IN LPCWSTR StringSecurityDescriptor, - IN DWORD StringSDRevision, - OUT PSECURITY_DESCRIPTOR* SecurityDescriptor, - OUT PULONG SecurityDescriptorSize) -{ - PSECURITY_DESCRIPTOR sd = NULL; - BOOL ret = FALSE; - - if (!StringSecurityDescriptor || !SecurityDescriptor) - SetLastError(ERROR_INVALID_PARAMETER); - else if (StringSDRevision != SDDL_REVISION_1) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - LPCWSTR ptr = StringSecurityDescriptor; - DWORD numberOfAces = 0; - DWORD relativeSdSize; - SIZE_T MaxAclSize; - PSECURITY_DESCRIPTOR relativeSd = NULL; - PSID pSid; - PACL pAcl; - BOOL present, dummy; - /* An easy way to know how much space we need for an ACL is to count - * the number of ACEs and say that we have 1 SID by ACE - */ - ptr = wcschr(StringSecurityDescriptor, SDDL_ACE_BEGINC); - while (ptr != NULL) - { - numberOfAces++; - ptr = wcschr(ptr + 1, SDDL_ACE_BEGINC); - } - MaxAclSize = sizeof(ACL) + numberOfAces * - (sizeof(ACCESS_ALLOWED_OBJECT_ACE) + SECURITY_MAX_SID_SIZE); - - sd = (SECURITY_DESCRIPTOR*)LocalAlloc(0, sizeof(SECURITY_DESCRIPTOR)); - if (!sd) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); - if (!ret) - goto cleanup; - - /* Now, really parse the string */ - ptr = StringSecurityDescriptor; - while (*ptr) - { - if (ptr[1] != SDDL_DELIMINATORC) - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - goto cleanup; - } - ptr += 2; - switch (ptr[-2]) - { - case 'O': - case 'G': - { - PSID pSid; - SIZE_T Length; - - ret = ParseSidString(ptr, &pSid, &Length); - if (!ret) - goto cleanup; - if (ptr[-2] == 'O') - ret = SetSecurityDescriptorOwner(sd, pSid, FALSE); - else - ret = SetSecurityDescriptorGroup(sd, pSid, FALSE); - if (!ret) - { - LocalFree(pSid); - goto cleanup; - } - ptr += Length; - break; - } - case 'D': - case 'S': - { - DWORD aclFlags; - SIZE_T Length; - BOOL isDacl = (ptr[-2] == 'D'); - - if (isDacl) - ret = ParseFlagsString(ptr, DaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); - else - ret = ParseFlagsString(ptr, SaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); - if (!ret) - goto cleanup; - pAcl = (PACL)LocalAlloc(0, MaxAclSize); - if (!pAcl) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - ret = FALSE; - goto cleanup; - } - if (!InitializeAcl(pAcl, (DWORD)MaxAclSize, ACL_REVISION_DS)) - { - LocalFree(pAcl); - goto cleanup; - } - if (aclFlags != 0) - { - ret = SetSecurityDescriptorControl( - sd, - (SECURITY_DESCRIPTOR_CONTROL)aclFlags, - (SECURITY_DESCRIPTOR_CONTROL)aclFlags); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - } - ptr += Length; - while (*ptr == SDDL_ACE_BEGINC) - { - ret = ParseAceString(ptr, pAcl, &Length); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - ptr += Length; - } - if (isDacl) - ret = SetSecurityDescriptorDacl(sd, TRUE, pAcl, FALSE); - else - ret = SetSecurityDescriptorSacl(sd, TRUE, pAcl, FALSE); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - break; - } - default: - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - goto cleanup; - } - } - } - - relativeSdSize = 0; - while (TRUE) - { - if (relativeSd) - LocalFree(relativeSd); - relativeSd = LocalAlloc(0, relativeSdSize); - if (!relativeSd) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - ret = MakeSelfRelativeSD(sd, relativeSd, &relativeSdSize); - if (ret || GetLastError() != ERROR_INSUFFICIENT_BUFFER) - break; - } - if (SecurityDescriptorSize) - *SecurityDescriptorSize = relativeSdSize; - *SecurityDescriptor = relativeSd; - -cleanup: - if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) - LocalFree(pSid); - if (GetSecurityDescriptorGroup(sd, &pSid, &dummy)) - LocalFree(pSid); - if (GetSecurityDescriptorDacl(sd, &present, &pAcl, &dummy) && present) - LocalFree(pAcl); - if (GetSecurityDescriptorSacl(sd, &present, &pAcl, &dummy) && present) - LocalFree(pAcl); - LocalFree(sd); - return ret; - } - return FALSE; -} - -/* Winehq cvs 20050916 */ -/****************************************************************************** - * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] - * @implemented - */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( - LPCSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) -{ - UINT len; - BOOL ret = FALSE; - LPWSTR StringSecurityDescriptorW; - - len = MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, NULL, 0); - StringSecurityDescriptorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if (StringSecurityDescriptorW) - { - MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, StringSecurityDescriptorW, len); - - ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(StringSecurityDescriptorW, - StringSDRevision, SecurityDescriptor, - SecurityDescriptorSize); - HeapFree(GetProcessHeap(), 0, StringSecurityDescriptorW); - } - - return ret; -} - -/* - * @implemented - */ -BOOL WINAPI -EqualPrefixSid(PSID pSid1, - PSID pSid2) -{ - return RtlEqualPrefixSid (pSid1, pSid2); -} - - -/* - * @implemented - */ -BOOL WINAPI -EqualSid(PSID pSid1, - PSID pSid2) -{ - return RtlEqualSid (pSid1, pSid2); -} - - -/* - * @implemented - * - * RETURNS - * Docs says this function does NOT return a value - * even thou it's defined to return a PVOID... - */ -PVOID WINAPI -FreeSid(PSID pSid) -{ - return RtlFreeSid(pSid); -} - - -/* - * @implemented - */ -DWORD WINAPI -GetLengthSid(PSID pSid) -{ - return (DWORD)RtlLengthSid(pSid); -} - - -/* - * @implemented - */ -PSID_IDENTIFIER_AUTHORITY WINAPI -GetSidIdentifierAuthority(PSID pSid) -{ - return RtlIdentifierAuthoritySid(pSid); -} - - -/* - * @implemented - */ -DWORD WINAPI -GetSidLengthRequired(UCHAR nSubAuthorityCount) -{ - return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount); -} - - -/* - * @implemented - */ -PDWORD WINAPI -GetSidSubAuthority(PSID pSid, - DWORD nSubAuthority) -{ - return (PDWORD)RtlSubAuthoritySid(pSid, nSubAuthority); -} - - -/* - * @implemented - */ -PUCHAR WINAPI -GetSidSubAuthorityCount(PSID pSid) -{ - return RtlSubAuthorityCountSid(pSid); -} - - -/* - * @implemented - */ -BOOL WINAPI -InitializeSid(PSID Sid, - PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, - BYTE nSubAuthorityCount) -{ - NTSTATUS Status; - - Status = RtlInitializeSid(Sid, - pIdentifierAuthority, - nSubAuthorityCount); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -IsValidSid(PSID pSid) -{ - return (BOOL)RtlValidSid(pSid); -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertSidToStringSidW(PSID Sid, - LPWSTR *StringSid) -{ - NTSTATUS Status; - UNICODE_STRING UnicodeString; - WCHAR FixedBuffer[64]; - - if (!RtlValidSid(Sid)) - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - UnicodeString.Length = 0; - UnicodeString.MaximumLength = sizeof(FixedBuffer); - UnicodeString.Buffer = FixedBuffer; - Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, FALSE); - if (STATUS_BUFFER_TOO_SMALL == Status) - { - Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, TRUE); - } - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - *StringSid = LocalAlloc(LMEM_FIXED, UnicodeString.Length + sizeof(WCHAR)); - if (NULL == *StringSid) - { - if (UnicodeString.Buffer != FixedBuffer) - { - RtlFreeUnicodeString(&UnicodeString); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - MoveMemory(*StringSid, UnicodeString.Buffer, UnicodeString.Length); - ZeroMemory((PCHAR) *StringSid + UnicodeString.Length, sizeof(WCHAR)); - if (UnicodeString.Buffer != FixedBuffer) - { - RtlFreeUnicodeString(&UnicodeString); - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertSidToStringSidA(PSID Sid, - LPSTR *StringSid) -{ - LPWSTR StringSidW; - int Len; - - if (!ConvertSidToStringSidW(Sid, &StringSidW)) - { - return FALSE; - } - - Len = WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, NULL, 0, NULL, NULL); - if (Len <= 0) - { - LocalFree(StringSidW); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - *StringSid = LocalAlloc(LMEM_FIXED, Len); - if (NULL == *StringSid) - { - LocalFree(StringSidW); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, *StringSid, Len, NULL, NULL)) - { - LocalFree(StringSid); - LocalFree(StringSidW); - return FALSE; - } - - LocalFree(StringSidW); - - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -EqualDomainSid(IN PSID pSid1, - IN PSID pSid2, - OUT BOOL* pfEqual) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -GetWindowsAccountDomainSid(IN PSID pSid, - OUT PSID ppDomainSid, - IN OUT DWORD* cbSid) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, - IN PSID DomainSid OPTIONAL, - OUT PSID pSid, - IN OUT DWORD* cbSid) -{ - unsigned int i; - TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - - if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { - if (WellKnownSids[i].Type == WellKnownSidType) { - DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - - if (*cbSid < length) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); - *cbSid = length; - return TRUE; - } - } - - if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) - if (WellKnownRids[i].Type == WellKnownSidType) { - UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); - DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); - DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); - - if (*cbSid < output_sid_length) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - CopyMemory(pSid, DomainSid, domain_sid_length); - (*GetSidSubAuthorityCount(pSid))++; - (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; - *cbSid = output_sid_length; - return TRUE; - } - - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -IsWellKnownSid(IN PSID pSid, - IN WELL_KNOWN_SID_TYPE WellKnownSidType) -{ - unsigned int i; - TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); - - for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) - { - if (WellKnownSids[i].Type == WellKnownSidType) - { - if (EqualSid(pSid, (PSID)((ULONG_PTR)&WellKnownSids[i].Sid.Revision))) - return TRUE; - } - } - - return FALSE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertStringSidToSidA(IN LPCSTR StringSid, - OUT PSID* sid) -{ - BOOL bRetVal = FALSE; - - if (!StringSid || !sid) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); - LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); - bRetVal = ConvertStringSidToSidW(wStringSid, sid); - HeapFree(GetProcessHeap(), 0, wStringSid); - } - return bRetVal; -} - /****************************************************************************** * ComputeStringSidSize @@ -1719,6 +788,976 @@ return GetSidLengthRequired(0); } + + +/****************************************************************************** + * ParseStringSidToSid + */ +static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) +{ + BOOL bret = FALSE; + SID* pisid=pSid; + + TRACE("%s, %p, %p\n", debugstr_w(StringSid), pSid, cBytes); + if (!StringSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + TRACE("StringSid is NULL, returning FALSE\n"); + return FALSE; + } + + *cBytes = ComputeStringSidSize(StringSid); + if (!pisid) /* Simply compute the size */ + { + TRACE("only size requested, returning TRUE\n"); + return TRUE; + } + + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ + { + DWORD i = 0, identAuth; + DWORD csubauth = ((*cBytes - GetSidLengthRequired(0)) / sizeof(DWORD)); + + StringSid += 2; /* Advance to Revision */ + pisid->Revision = atoiW(StringSid); + + if (pisid->Revision != SDDL_REVISION) + { + TRACE("Revision %d is unknown\n", pisid->Revision); + goto lend; /* ERROR_INVALID_SID */ + } + if (csubauth == 0) + { + TRACE("SubAuthorityCount is 0\n"); + goto lend; /* ERROR_INVALID_SID */ + } + + pisid->SubAuthorityCount = csubauth; + + /* Advance to identifier authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + /* MS' implementation can't handle values greater than 2^32 - 1, so + * we don't either; assume most significant bytes are always 0 + */ + pisid->IdentifierAuthority.Value[0] = 0; + pisid->IdentifierAuthority.Value[1] = 0; + identAuth = atoiW(StringSid); + pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; + pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; + pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; + pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; + + /* Advance to first sub authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + while (*StringSid) + { + pisid->SubAuthority[i++] = atoiW(StringSid); + + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + } + + if (i != pisid->SubAuthorityCount) + goto lend; /* ERROR_INVALID_SID */ + + bret = TRUE; + } + else /* String constant format - Only available in winxp and above */ + { + unsigned int i; + pisid->Revision = SDDL_REVISION; + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) + { + DWORD j; + pisid->SubAuthorityCount = WellKnownSids[i].Sid.SubAuthorityCount; + pisid->IdentifierAuthority = WellKnownSids[i].Sid.IdentifierAuthority; + for (j = 0; j < WellKnownSids[i].Sid.SubAuthorityCount; j++) + pisid->SubAuthority[j] = WellKnownSids[i].Sid.SubAuthority[j]; + bret = TRUE; + } + + if (!bret) + FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); + } + +lend: + if (!bret) + SetLastError(ERROR_INVALID_SID); + + TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); + return bret; +} + + +/****************************************************************************** + * ParseAclStringFlags + */ +static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) +{ + DWORD flags = 0; + LPCWSTR szAcl = *StringAcl; + + while (*szAcl != '(') + { + if (*szAcl == 'P') + { + flags |= SE_DACL_PROTECTED; + } + else if (*szAcl == 'A') + { + szAcl++; + if (*szAcl == 'R') + flags |= SE_DACL_AUTO_INHERIT_REQ; + else if (*szAcl == 'I') + flags |= SE_DACL_AUTO_INHERITED; + } + szAcl++; + } + + *StringAcl = szAcl; + return flags; +} + + +/****************************************************************************** + * ParseAceStringType + */ +static const ACEFLAG AceType[] = +{ + { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, + { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, + { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, + { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + /* + { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, + */ + { NULL, 0 }, +}; + +static BYTE ParseAceStringType(LPCWSTR* StringAcl) +{ + UINT len = 0; + LPCWSTR szAcl = *StringAcl; + const ACEFLAG *lpaf = AceType; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + lpaf++; + + if (!lpaf->wstr) + return 0; + + *StringAcl += len; + return lpaf->value; +} + + +/****************************************************************************** + * ParseAceStringFlags + */ +static const ACEFLAG AceFlags[] = +{ + { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, + { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, + { SDDL_INHERITED, INHERITED_ACE }, + { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, + { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, + { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, + { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, + { NULL, 0 }, +}; + +static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) +{ + UINT len = 0; + BYTE flags = 0; + LPCWSTR szAcl = *StringAcl; + + while (*szAcl != ';') + { + const ACEFLAG *lpaf = AceFlags; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + lpaf++; + + if (!lpaf->wstr) + return 0; + + flags |= lpaf->value; + szAcl += len; + } + + *StringAcl = szAcl; + return flags; +} + + +/****************************************************************************** + * ParseAceStringRights + */ +static DWORD ParseAceStringRights(LPCWSTR* StringAcl) +{ + UINT len = 0; + DWORD rights = 0; + LPCWSTR szAcl = *StringAcl; + + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) + { + LPCWSTR p = szAcl; + + while (*p && *p != ';') + p++; + + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + rights = strtoulW(szAcl, NULL, 16); + szAcl = p; + } + else + WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); + } + else + { + while (*szAcl != ';') + { + const ACEFLAG *lpaf = AceRights; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + { + lpaf++; + } + + if (!lpaf->wstr) + return 0; + + rights |= lpaf->value; + szAcl += len; + } + } + + *StringAcl = szAcl; + return rights; +} + + +/****************************************************************************** + * ParseStringAclToAcl + * + * dacl_flags(string_ace1)(string_ace2)... (string_acen) + */ +static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, + PACL pAcl, LPDWORD cBytes) +{ + DWORD val; + DWORD sidlen; + DWORD length = sizeof(ACL); + DWORD acesize = 0; + DWORD acecount = 0; + PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + + TRACE("%s\n", debugstr_w(StringAcl)); + + if (!StringAcl) + return FALSE; + + if (pAcl) /* pAce is only useful if we're setting values */ + pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); + + /* Parse ACL flags */ + *lpdwFlags = ParseAclStringFlags(&StringAcl); + + /* Parse ACE */ + while (*StringAcl == '(') + { + StringAcl++; + + /* Parse ACE type */ + val = ParseAceStringType(&StringAcl); + if (pAce) + pAce->Header.AceType = (BYTE) val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE flags */ + val = ParseAceStringFlags(&StringAcl); + if (pAce) + pAce->Header.AceFlags = (BYTE) val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE rights */ + val = ParseAceStringRights(&StringAcl); + if (pAce) + pAce->Mask = val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE object guid */ + if (*StringAcl != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto lerr; + } + StringAcl++; + + /* Parse ACE inherit object guid */ + if (*StringAcl != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto lerr; + } + StringAcl++; + + /* Parse ACE account sid */ + if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) + { + while (*StringAcl && *StringAcl != ')') + StringAcl++; + } + + if (*StringAcl != ')') + goto lerr; + StringAcl++; + + acesize = sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + length += acesize; + if (pAce) + { + pAce->Header.AceSize = acesize; + pAce = (PACCESS_ALLOWED_ACE)((LPBYTE)pAce + acesize); + } + acecount++; + } + + *cBytes = length; + + if (length > 0xffff) + { + ERR("ACL too large\n"); + goto lerr; + } + + if (pAcl) + { + pAcl->AclRevision = ACL_REVISION; + pAcl->Sbz1 = 0; + pAcl->AclSize = length; + pAcl->AceCount = acecount++; + pAcl->Sbz2 = 0; + } + return TRUE; + +lerr: + SetLastError(ERROR_INVALID_ACL); + WARN("Invalid ACE string format\n"); + return FALSE; +} + + +/****************************************************************************** + * ParseStringSecurityDescriptorToSecurityDescriptor + */ +static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( + LPCWSTR StringSecurityDescriptor, + SECURITY_DESCRIPTOR* SecurityDescriptor, + LPDWORD cBytes) +{ + BOOL bret = FALSE; + WCHAR toktype; + WCHAR tok[MAX_PATH]; + LPCWSTR lptoken; + LPBYTE lpNext = NULL; + DWORD len; + + *cBytes = sizeof(SECURITY_DESCRIPTOR); + + if (SecurityDescriptor) + lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); + + while (*StringSecurityDescriptor) + { + toktype = *StringSecurityDescriptor; + + /* Expect char identifier followed by ':' */ + StringSecurityDescriptor++; + if (*StringSecurityDescriptor != ':') + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + StringSecurityDescriptor++; + + /* Extract token */ + lptoken = StringSecurityDescriptor; + while (*lptoken && *lptoken != ':') + lptoken++; + + if (*lptoken) + lptoken--; + + len = lptoken - StringSecurityDescriptor; + memcpy( tok, StringSecurityDescriptor, len * sizeof(WCHAR) ); + tok[len] = 0; + + switch (toktype) + { + case 'O': + { + DWORD bytes; + + if (!ParseStringSidToSid(tok, lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'G': + { + DWORD bytes; + + if (!ParseStringSidToSid(tok, lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'D': + { + DWORD flags; + DWORD bytes; + + if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; + SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'S': + { + DWORD flags; + DWORD bytes; + + if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; + SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + default: + FIXME("Unknown token\n"); + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + + StringSecurityDescriptor = lptoken; + } + + bret = TRUE; + +lend: + return bret; +} + + +/****************************************************************************** + * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] + * @implemented + */ +BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( + LPCWSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) +{ + DWORD cBytes; + SECURITY_DESCRIPTOR* psd; + BOOL bret = FALSE; + + TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + + if (GetVersion() & 0x80000000) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto lend; + } + else if (!StringSecurityDescriptor || !SecurityDescriptor) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + else if (StringSDRevision != SID_REVISION) + { + SetLastError(ERROR_UNKNOWN_REVISION); + goto lend; + } + + /* Compute security descriptor length */ + if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + NULL, &cBytes)) + goto lend; + + psd = *SecurityDescriptor = LocalAlloc(GMEM_ZEROINIT, cBytes); + if (!psd) goto lend; + + psd->Revision = SID_REVISION; + psd->Control |= SE_SELF_RELATIVE; + + if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + psd, &cBytes)) + { + LocalFree(psd); + goto lend; + } + + if (SecurityDescriptorSize) + *SecurityDescriptorSize = cBytes; + + bret = TRUE; + +lend: + TRACE(" ret=%d\n", bret); + return bret; +} + + +/* Winehq cvs 20050916 */ +/****************************************************************************** + * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] + * @implemented + */ +BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( + LPCSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) +{ + UINT len; + BOOL ret = FALSE; + LPWSTR StringSecurityDescriptorW; + + len = MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, NULL, 0); + StringSecurityDescriptorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (StringSecurityDescriptorW) + { + MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, StringSecurityDescriptorW, len); + + ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(StringSecurityDescriptorW, + StringSDRevision, SecurityDescriptor, + SecurityDescriptorSize); + HeapFree(GetProcessHeap(), 0, StringSecurityDescriptorW); + } + + return ret; +} + +/* + * @implemented + */ +BOOL WINAPI +EqualPrefixSid(PSID pSid1, + PSID pSid2) +{ + return RtlEqualPrefixSid (pSid1, pSid2); +} + + +/* + * @implemented + */ +BOOL WINAPI +EqualSid(PSID pSid1, + PSID pSid2) +{ + return RtlEqualSid (pSid1, pSid2); +} + + +/* + * @implemented + * + * RETURNS + * Docs says this function does NOT return a value + * even thou it's defined to return a PVOID... + */ +PVOID WINAPI +FreeSid(PSID pSid) +{ + return RtlFreeSid(pSid); +} + + +/* + * @implemented + */ +DWORD WINAPI +GetLengthSid(PSID pSid) +{ + return (DWORD)RtlLengthSid(pSid); +} + + +/* + * @implemented + */ +PSID_IDENTIFIER_AUTHORITY WINAPI +GetSidIdentifierAuthority(PSID pSid) +{ + return RtlIdentifierAuthoritySid(pSid); +} + + +/* + * @implemented + */ +DWORD WINAPI +GetSidLengthRequired(UCHAR nSubAuthorityCount) +{ + return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount); +} + + +/* + * @implemented + */ +PDWORD WINAPI +GetSidSubAuthority(PSID pSid, + DWORD nSubAuthority) +{ + return (PDWORD)RtlSubAuthoritySid(pSid, nSubAuthority); +} + + +/* + * @implemented + */ +PUCHAR WINAPI +GetSidSubAuthorityCount(PSID pSid) +{ + return RtlSubAuthorityCountSid(pSid); +} + + +/* + * @implemented + */ +BOOL WINAPI +InitializeSid(PSID Sid, + PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, + BYTE nSubAuthorityCount) +{ + NTSTATUS Status; + + Status = RtlInitializeSid(Sid, + pIdentifierAuthority, + nSubAuthorityCount); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +IsValidSid(PSID pSid) +{ + return (BOOL)RtlValidSid(pSid); +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertSidToStringSidW(PSID Sid, + LPWSTR *StringSid) +{ + NTSTATUS Status; + UNICODE_STRING UnicodeString; + WCHAR FixedBuffer[64]; + + if (!RtlValidSid(Sid)) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + UnicodeString.Length = 0; + UnicodeString.MaximumLength = sizeof(FixedBuffer); + UnicodeString.Buffer = FixedBuffer; + Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, FALSE); + if (STATUS_BUFFER_TOO_SMALL == Status) + { + Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, TRUE); + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *StringSid = LocalAlloc(LMEM_FIXED, UnicodeString.Length + sizeof(WCHAR)); + if (NULL == *StringSid) + { + if (UnicodeString.Buffer != FixedBuffer) + { + RtlFreeUnicodeString(&UnicodeString); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MoveMemory(*StringSid, UnicodeString.Buffer, UnicodeString.Length); + ZeroMemory((PCHAR) *StringSid + UnicodeString.Length, sizeof(WCHAR)); + if (UnicodeString.Buffer != FixedBuffer) + { + RtlFreeUnicodeString(&UnicodeString); + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertSidToStringSidA(PSID Sid, + LPSTR *StringSid) +{ + LPWSTR StringSidW; + int Len; + + if (!ConvertSidToStringSidW(Sid, &StringSidW)) + { + return FALSE; + } + + Len = WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, NULL, 0, NULL, NULL); + if (Len <= 0) + { + LocalFree(StringSidW); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + *StringSid = LocalAlloc(LMEM_FIXED, Len); + if (NULL == *StringSid) + { + LocalFree(StringSidW); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, *StringSid, Len, NULL, NULL)) + { + LocalFree(StringSid); + LocalFree(StringSidW); + return FALSE; + } + + LocalFree(StringSidW); + + return TRUE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +EqualDomainSid(IN PSID pSid1, + IN PSID pSid2, + OUT BOOL* pfEqual) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +GetWindowsAccountDomainSid(IN PSID pSid, + OUT PSID ppDomainSid, + IN OUT DWORD* cbSid) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, + IN PSID DomainSid OPTIONAL, + OUT PSID pSid, + IN OUT DWORD* cbSid) +{ + unsigned int i; + TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); + + if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + if (WellKnownSids[i].Type == WellKnownSidType) { + DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + + if (*cbSid < length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); + *cbSid = length; + return TRUE; + } + } + + if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (WellKnownRids[i].Type == WellKnownSidType) { + UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); + DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); + DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); + + if (*cbSid < output_sid_length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, DomainSid, domain_sid_length); + (*GetSidSubAuthorityCount(pSid))++; + (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; + *cbSid = output_sid_length; + return TRUE; + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +IsWellKnownSid(IN PSID pSid, + IN WELL_KNOWN_SID_TYPE WellKnownSidType) +{ + unsigned int i; + TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); + + for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) + { + if (WellKnownSids[i].Type == WellKnownSidType) + { + if (EqualSid(pSid, (PSID)((ULONG_PTR)&WellKnownSids[i].Sid.Revision))) + return TRUE; + } + } + + return FALSE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertStringSidToSidA(IN LPCSTR StringSid, + OUT PSID* sid) +{ + BOOL bRetVal = FALSE; + + if (!StringSid || !sid) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); + LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); + bRetVal = ConvertStringSidToSidW(wStringSid, sid); + HeapFree(GetProcessHeap(), 0, wStringSid); + } + return bRetVal; +} + static const RECORD SidTable[] = { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 14 19:36:39 2009 @@ -193,6 +193,8 @@ advapi32 - reactos/dll/win32/advapi32/crypt/*.c # ekohl says we're not sharing this + reactos/dll/win32/advapi32/sec/cred.c # Out of Sync + reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 - reactos/dll/win32/gdi32/objects/linedda.c # Synched at 20090410

15 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
...
48
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 April 2009