Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[janderwald] 43850: - Fix a broken cast (x64 compability)
by janderwald＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: janderwald Date: Fri Oct 30 16:36:55 2009 New Revision: 43850 URL: http://svn.reactos.org/svn/reactos?rev=43850&view=rev Log: - Fix a broken cast (x64 compability) Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Fri Oct 30 16:36:55 2009 @@ -185,7 +185,7 @@ PHANDLE ConnectionHandle) { ULONG BufferSize = sizeof(KSPIN_CONNECT); - PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) ); + PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ((ULONG_PTR)Connect + sizeof(KSPIN_CONNECT))); BufferSize += DataFormat->FormatSize;

1 0

[tkreuzer] 43849: [WIN32K] EngCopyBits: Use goto cleanup / break instead of code duplication, fix leaking a bits lock, if the rect function fails, remove abundant MouseSafetyOnDrawEnd
by tkreuzer＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: tkreuzer Date: Fri Oct 30 16:22:57 2009 New Revision: 43849 URL: http://svn.reactos.org/svn/reactos?rev=43849&view=rev Log: [WIN32K] EngCopyBits: Use goto cleanup / break instead of code duplication, fix leaking a bits lock, if the rect function fails, remove abundant MouseSafetyOnDrawEnd Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Fri Oct 30 16:22:57 2009 @@ -42,7 +42,7 @@ RECTL *DestRect, POINTL *SourcePoint) { - BOOLEAN ret; + BOOL ret; BYTE clippingType; RECT_ENUM RectEnum; BOOL EnumMore; @@ -78,13 +78,7 @@ ret = GDIDEVFUNCS(psoDest).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return ret; + goto cleanup; } } @@ -97,13 +91,7 @@ ret = GDIDEVFUNCS(psoSource).CopyBits( psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return ret; + goto cleanup; } } @@ -112,17 +100,11 @@ NULL, Clip, ColorTranslation, DestRect, SourcePoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return ret; + goto cleanup; } // Determine clipping type - if (Clip == (CLIPOBJ *) NULL) + if (!Clip) { clippingType = DC_TRIVIAL; } @@ -143,16 +125,8 @@ BltInfo.DestRect = *DestRect; BltInfo.SourcePoint = *SourcePoint; - DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - - MouseSafetyOnDrawEnd(psoDest); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return TRUE; + ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); + break; case DC_RECT: // Clip the blt to the clip rectangle @@ -161,15 +135,8 @@ BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left; BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top - DestRect->top; - DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return TRUE; + ret = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); + break; case DC_COMPLEX: @@ -192,7 +159,10 @@ BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top; if (!DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo)) - return FALSE; + { + ret = FALSE; + goto cleanup; + } prcl++; @@ -200,23 +170,23 @@ } } while (EnumMore); - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return TRUE; - } - + ret = TRUE; + break; + + default: + ASSERT(FALSE); + ret = FALSE; + break; + } + +cleanup: if (psoDest != psoSource) { SURFACE_UnlockBitmapBits(psurfDest); } SURFACE_UnlockBitmapBits(psurfSource); - return FALSE; + return ret; } BOOL APIENTRY

1 0

[tkreuzer] 43848: [FORMATTING] - apply consistent indentattion of 4 spaces - remove () from return statements
by tkreuzer＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: tkreuzer Date: Fri Oct 30 16:00:08 2009 New Revision: 43848 URL: http://svn.reactos.org/svn/reactos?rev=43848&view=rev Log: [FORMATTING] - apply consistent indentattion of 4 spaces - remove () from return statements Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c Modified: trunk/reactos/subsystems/win32/win32k/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/copybits.c [iso-8859-1] Fri Oct 30 16:00:08 2009 @@ -36,183 +36,187 @@ */ BOOL APIENTRY EngCopyBits(SURFOBJ *psoDest, - SURFOBJ *psoSource, - CLIPOBJ *Clip, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint) + SURFOBJ *psoSource, + CLIPOBJ *Clip, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint) { - BOOLEAN ret; - BYTE clippingType; - RECT_ENUM RectEnum; - BOOL EnumMore; - BLTINFO BltInfo; - SURFACE *psurfDest; - SURFACE *psurfSource; - - ASSERT(psoDest != NULL && psoSource != NULL && DestRect != NULL && SourcePoint != NULL); - - psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); - SURFACE_LockBitmapBits(psurfSource); - - psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - if (psoDest != psoSource) - { - SURFACE_LockBitmapBits(psurfDest); - } - - // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, - // mark the copy block function to be DrvCopyBits instead of the - // GDI's copy bit function so as to remove clipping from the - // driver's responsibility - - // If one of the surfaces isn't managed by the GDI - if((psoDest->iType!=STYPE_BITMAP) || (psoSource->iType!=STYPE_BITMAP)) - { - // Destination surface is device managed - if(psoDest->iType!=STYPE_BITMAP) - { - /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - if (psurfDest->flHooks & HOOK_COPYBITS) - { - ret = GDIDEVFUNCS(psoDest).CopyBits( - psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); + BOOLEAN ret; + BYTE clippingType; + RECT_ENUM RectEnum; + BOOL EnumMore; + BLTINFO BltInfo; + SURFACE *psurfDest; + SURFACE *psurfSource; + + ASSERT(psoDest != NULL && psoSource != NULL && DestRect != NULL && SourcePoint != NULL); + + psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); + SURFACE_LockBitmapBits(psurfSource); + + psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); + if (psoDest != psoSource) + { + SURFACE_LockBitmapBits(psurfDest); + } + + // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, + // mark the copy block function to be DrvCopyBits instead of the + // GDI's copy bit function so as to remove clipping from the + // driver's responsibility + + // If one of the surfaces isn't managed by the GDI + if ((psoDest->iType!=STYPE_BITMAP) || (psoSource->iType!=STYPE_BITMAP)) + { + // Destination surface is device managed + if (psoDest->iType!=STYPE_BITMAP) + { + /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ + if (psurfDest->flHooks & HOOK_COPYBITS) + { + ret = GDIDEVFUNCS(psoDest).CopyBits( + psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); + + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } + SURFACE_UnlockBitmapBits(psurfSource); + + return ret; + } + } + + // Source surface is device managed + if (psoSource->iType!=STYPE_BITMAP) + { + /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ + if (psurfSource->flHooks & HOOK_COPYBITS) + { + ret = GDIDEVFUNCS(psoSource).CopyBits( + psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); + + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } + SURFACE_UnlockBitmapBits(psurfSource); + + return ret; + } + } + + // If CopyBits wasn't hooked, BitBlt must be + ret = IntEngBitBlt(psoDest, psoSource, + NULL, Clip, ColorTranslation, DestRect, SourcePoint, + NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); if (psoDest != psoSource) { - SURFACE_UnlockBitmapBits(psurfDest); + SURFACE_UnlockBitmapBits(psurfDest); } SURFACE_UnlockBitmapBits(psurfSource); return ret; - } - } - - // Source surface is device managed - if(psoSource->iType!=STYPE_BITMAP) - { - /* FIXME: Eng* functions shouldn't call Drv* functions. ? */ - if (psurfSource->flHooks & HOOK_COPYBITS) - { - ret = GDIDEVFUNCS(psoSource).CopyBits( - psoDest, psoSource, Clip, ColorTranslation, DestRect, SourcePoint); - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return ret; - } - } - - // If CopyBits wasn't hooked, BitBlt must be - ret = IntEngBitBlt(psoDest, psoSource, - NULL, Clip, ColorTranslation, DestRect, SourcePoint, - NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); + } + + // Determine clipping type + if (Clip == (CLIPOBJ *) NULL) + { + clippingType = DC_TRIVIAL; + } + else + { + clippingType = Clip->iDComplexity; + } + + BltInfo.DestSurface = psoDest; + BltInfo.SourceSurface = psoSource; + BltInfo.PatternSurface = NULL; + BltInfo.XlateSourceToDest = ColorTranslation; + BltInfo.Rop4 = SRCCOPY; + + switch (clippingType) + { + case DC_TRIVIAL: + BltInfo.DestRect = *DestRect; + BltInfo.SourcePoint = *SourcePoint; + + DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); + + MouseSafetyOnDrawEnd(psoDest); + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } + SURFACE_UnlockBitmapBits(psurfSource); + + return TRUE; + + case DC_RECT: + // Clip the blt to the clip rectangle + RECTL_bIntersectRect(&BltInfo.DestRect, DestRect, &Clip->rclBounds); + + BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left; + BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top - DestRect->top; + + DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); + + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } + SURFACE_UnlockBitmapBits(psurfSource); + + return TRUE; + + case DC_COMPLEX: + + CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_ANY, 0); + + do + { + EnumMore = CLIPOBJ_bEnum(Clip,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + + if (RectEnum.c > 0) + { + RECTL* prclEnd = &RectEnum.arcl[RectEnum.c]; + RECTL* prcl = &RectEnum.arcl[0]; + + do + { + RECTL_bIntersectRect(&BltInfo.DestRect, prcl, DestRect); + + BltInfo.SourcePoint.x = SourcePoint->x + prcl->left - DestRect->left; + BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top; + + if (!DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo)) + return FALSE; + + prcl++; + + } while (prcl < prclEnd); + } + + } while (EnumMore); + + if (psoDest != psoSource) + { + SURFACE_UnlockBitmapBits(psurfDest); + } + SURFACE_UnlockBitmapBits(psurfSource); + + return TRUE; + } if (psoDest != psoSource) { - SURFACE_UnlockBitmapBits(psurfDest); + SURFACE_UnlockBitmapBits(psurfDest); } SURFACE_UnlockBitmapBits(psurfSource); - return ret; - } - - // Determine clipping type - if (Clip == (CLIPOBJ *) NULL) - { - clippingType = DC_TRIVIAL; - } else { - clippingType = Clip->iDComplexity; - } - - BltInfo.DestSurface = psoDest; - BltInfo.SourceSurface = psoSource; - BltInfo.PatternSurface = NULL; - BltInfo.XlateSourceToDest = ColorTranslation; - BltInfo.Rop4 = SRCCOPY; - - switch(clippingType) - { - case DC_TRIVIAL: - BltInfo.DestRect = *DestRect; - BltInfo.SourcePoint = *SourcePoint; - - DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - - MouseSafetyOnDrawEnd(psoDest); - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return(TRUE); - - case DC_RECT: - // Clip the blt to the clip rectangle - RECTL_bIntersectRect(&BltInfo.DestRect, DestRect, &Clip->rclBounds); - - BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left; - BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top - DestRect->top; - - DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo); - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return(TRUE); - - case DC_COMPLEX: - - CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_ANY, 0); - - do { - EnumMore = CLIPOBJ_bEnum(Clip,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - - if (RectEnum.c > 0) - { - RECTL* prclEnd = &RectEnum.arcl[RectEnum.c]; - RECTL* prcl = &RectEnum.arcl[0]; - - do { - RECTL_bIntersectRect(&BltInfo.DestRect, prcl, DestRect); - - BltInfo.SourcePoint.x = SourcePoint->x + prcl->left - DestRect->left; - BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top; - - if(!DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo)) - return FALSE; - - prcl++; - - } while (prcl < prclEnd); - } - - } while(EnumMore); - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return(TRUE); - } - - if (psoDest != psoSource) - { - SURFACE_UnlockBitmapBits(psurfDest); - } - SURFACE_UnlockBitmapBits(psurfSource); - - return FALSE; + return FALSE; } BOOL APIENTRY @@ -227,8 +231,8 @@ BOOL bResult; MouseSafetyOnDrawStart(psoSource, ptlSource->x, ptlSource->y, - (ptlSource->x + abs(prclDest->right - prclDest->left)), - (ptlSource->y + abs(prclDest->bottom - prclDest->top))); + (ptlSource->x + abs(prclDest->right - prclDest->left)), + (ptlSource->y + abs(prclDest->bottom - prclDest->top))); MouseSafetyOnDrawStart(psoDest, prclDest->left, prclDest->top, prclDest->right, prclDest->bottom);

1 0

[sserapion] 43847: Fix gdi32 build for real.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 15:24:42 2009 New Revision: 43847 URL: http://svn.reactos.org/svn/reactos?rev=43847&view=rev Log: Fix gdi32 build for real. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Fri Oct 30 15:24:42 2009 @@ -1411,7 +1411,7 @@ RtlMoveMemory(&SurfaceMore.ddsCapsEx, &pSurface->ddckCKDestBlt, sizeof(DDSCAPSEX)); - SurfaceMore.dwSurfaceHandle = (DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl; + SurfaceMore.dwSurfaceHandle = PtrToUlong(pSurface->dbnOverlayNode.object_int->lpVtbl); /* Set up SurfaceGlobal struct */ SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem; @@ -1433,12 +1433,12 @@ } /* Create the object */ - pSurface->hDDSurface = (DWORD)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD), - (HANDLE)pSurface->hDDSurface, - &SurfaceLocal, - &SurfaceMore, - &SurfaceGlobal, - bComplete); + pSurface->hDDSurface = (ULONG_PTR)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD), + (HANDLE)pSurface->hDDSurface, + &SurfaceLocal, + &SurfaceMore, + &SurfaceGlobal, + bComplete); /* Return status */ if (pSurface->hDDSurface) return TRUE; Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] Fri Oct 30 15:24:42 2009 @@ -28,11 +28,11 @@ -typedef int (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL (WINAPI *SWAPBUFFERS) (HDC hdc); -typedef int (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -typedef int (WINAPI *GETPIXELFMT) (HDC); +typedef INT_PTR (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); +typedef INT_PTR (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); +typedef INT_PTR (WINAPI *SWAPBUFFERS) (HDC hdc); +typedef INT_PTR (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); +typedef INT_PTR (WINAPI *GETPIXELFMT) (HDC); static CHOOSEPIXELFMT glChoosePixelFormat = NULL; Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Oct 30 15:24:42 2009 @@ -418,7 +418,7 @@ } } - if ((PtrToUlong(lpvBits)) & (sizeof(DWORD) - 1)) + if (((ULONG_PTR)lpvBits) & (sizeof(DWORD) - 1)) { pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); if (!pvSafeBits) Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Fri Oct 30 15:24:42 2009 @@ -142,7 +142,7 @@ WINAPI CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( ULongToPtr(fnPolyFillMode), (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); + return (HRGN) NtGdiPolyPolyDraw( ULongToHandle(fnPolyFillMode), (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); }

1 0

[tkreuzer] 43846: [WIN32K] Lock the DIB palette in NtGdiSetDIBitsToDeviceInternal instead of passing NULL to EXLATEOBJ_vInitialize. Fixes LightBox Editor regression (bug 4913 )
by tkreuzer＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: tkreuzer Date: Fri Oct 30 15:02:42 2009 New Revision: 43846 URL: http://svn.reactos.org/svn/reactos?rev=43846&view=rev Log: [WIN32K] Lock the DIB palette in NtGdiSetDIBitsToDeviceInternal instead of passing NULL to EXLATEOBJ_vInitialize. Fixes LightBox Editor regression (bug 4913 ) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c 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] Fri Oct 30 15:02:42 2009 @@ -444,7 +444,7 @@ SIZEL SourceSize; EXLATEOBJ exlo; PPALETTE ppalDDB = NULL, ppalDIB = NULL; - HPALETTE DDBPalette, DIBPalette = NULL; + HPALETTE hpalDDB, hpalDIB = NULL; ULONG DIBPaletteType; if (!Bits) return 0; @@ -478,13 +478,13 @@ } /* Use destination palette obtained from the DC by default */ - DDBPalette = pDC->ppdev->devinfo.hpalDefault; + hpalDDB = pDC->ppdev->devinfo.hpalDefault; /* Try to use hDIBPalette if it exists */ pSurf = pDC->dclevel.pSurface; if (pSurf && pSurf->hDIBPalette) { - DDBPalette = pSurf->hDIBPalette; + hpalDDB = pSurf->hDIBPalette; } pDestSurf = pSurf ? &pSurf->SurfObj : NULL; @@ -526,7 +526,7 @@ } /* Obtain destination palette */ - ppalDDB = PALETTE_LockPalette(DDBPalette); + ppalDDB = PALETTE_LockPalette(hpalDDB); if (!ppalDDB) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -534,11 +534,21 @@ goto Exit; } - DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); - if (!DIBPalette) + /* Create a palette for the DIB */ + hpalDIB = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); + if (!hpalDIB) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); Status = STATUS_NO_MEMORY; + goto Exit; + } + + /* Lock the DIB palette */ + ppalDIB = PALETTE_LockPalette(hpalDIB); + if (!ppalDDB) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + Status = STATUS_UNSUCCESSFUL; goto Exit; } @@ -573,7 +583,7 @@ if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); - if (DIBPalette) PALETTE_FreePaletteByHandle(DIBPalette); + if (hpalDIB) PALETTE_FreePaletteByHandle(hpalDIB); DC_UnlockDc(pDC); return ret;

1 0

[mjmartin] 43845: [msi] - Schedule a rename operation also for ERROR_USER_MAPPED_FILE. Prevents msi from aborting an install when attempting to overwrite font files. Open Office should now install successfully.
by mjmartin＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: mjmartin Date: Fri Oct 30 13:53:19 2009 New Revision: 43845 URL: http://svn.reactos.org/svn/reactos?rev=43845&view=rev Log: [msi] - Schedule a rename operation also for ERROR_USER_MAPPED_FILE. Prevents msi from aborting an install when attempting to overwrite font files. Open Office should now install successfully. Modified: trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/media.c Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Fri Oct 30 13:53:19 2009 @@ -155,7 +155,7 @@ gle = copy_file(file, source); TRACE("Overwriting existing file: %d\n", gle); } - if (gle == ERROR_SHARING_VIOLATION) + if ((gle == ERROR_SHARING_VIOLATION) || (gle == ERROR_USER_MAPPED_FILE)) { WCHAR tmpfileW[MAX_PATH], *pathW, *p; DWORD len; Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Fri Oct 30 13:53:19 2009 @@ -353,7 +353,7 @@ if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError(); } - if (err == ERROR_SHARING_VIOLATION) + if ((err == ERROR_SHARING_VIOLATION) || (err == ERROR_USER_MAPPED_FILE)) { WCHAR tmpfileW[MAX_PATH], *tmppathW, *p; DWORD len;

1 0

[cgutman] 43844: - Don't convert the host name to lower case
by cgutman＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: cgutman Date: Fri Oct 30 05:29:38 2009 New Revision: 43844 URL: http://svn.reactos.org/svn/reactos?rev=43844&view=rev Log: - Don't convert the host name to lower case Modified: trunk/reactos/base/services/dhcp/util.c Modified: trunk/reactos/base/services/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/util.c?… ============================================================================== --- trunk/reactos/base/services/dhcp/util.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/util.c [iso-8859-1] Fri Oct 30 05:29:38 2009 @@ -119,7 +119,7 @@ if (lpCompName !=NULL) { memcpy(lpCompName, ComputerName, ComputerNameSize + 1); /* Send our hostname, some dhcpds use this to update DNS */ - config->send_options[DHO_HOST_NAME].data = (u_int8_t*)_strlwr(lpCompName); + config->send_options[DHO_HOST_NAME].data = (u_int8_t*)lpCompName; config->send_options[DHO_HOST_NAME].len = ComputerNameSize; debug("Hostname: %s, length: %d", config->send_options[DHO_HOST_NAME].data,

1 0

[sserapion] 43843: Temporarily remove mmebuddy dependencies.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:36:40 2009 New Revision: 43843 URL: http://svn.reactos.org/svn/reactos?rev=43843&view=rev Log: Temporarily remove mmebuddy dependencies. Modified: branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Oct 30 01:36:40 2009 @@ -499,9 +499,9 @@ <directory name="smdll"> <xi:include href="smdll/smdll.rbuild" /> </directory> -<directory name="sndblst"> + <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> @@ -583,9 +583,9 @@ <directory name="version"> <xi:include href="version/version.rbuild" /> </directory> -<directory name="wdmaud.drv"> + <directory name="windowscodecs"> <xi:include href="windowscodecs/windowscodecs.rbuild" /> </directory>

1 0

[sserapion] 43842: Fix gdi32 build.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:24:32 2009 New Revision: 43842 URL: http://svn.reactos.org/svn/reactos?rev=43842&view=rev Log: Fix gdi32 build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -418,7 +418,7 @@ } } - if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) + if ((PtrToUlong(lpvBits)) & (sizeof(DWORD) - 1)) { pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); if (!pvSafeBits) Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -322,7 +322,7 @@ /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; - if (0 != ((DWORD) hObject & GDI_HANDLE_STOCK_MASK)) + if (0 != (HandleToUlong(hObject) & GDI_HANDLE_STOCK_MASK)) { // Relax! This is a normal return! DPRINT("Trying to delete system object 0x%x\n", hObject); return TRUE; @@ -1559,7 +1559,7 @@ switch (uType) { case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); + return ULongToHandle(ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY)); case GDI_OBJECT_TYPE_BITMAP: return NtGdiSelectBitmap(hDC, hGdiObj); Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -163,7 +163,7 @@ if (pPDev->Sig != PDEV_UMPD_ID) { - pPDev = (PUMPDEV)pPDev->Sig; + pPDev = (PUMPDEV)ULongToPtr(pPDev->Sig);//wtf? } return pPDev->pdi5Info->pDriverPath; } @@ -180,7 +180,7 @@ if (pPDev->Sig != PDEV_UMPD_ID) { - pPDev = (PUMPDEV)pPDev->Sig; + pPDev = (PUMPDEV)ULongToPtr(pPDev->Sig);//wtf } return pPDev->pdi5Info->pDataFile; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -1021,19 +1021,19 @@ needed = sizeof(OUTLINETEXTMETRICA); if(lpOTMW->otmpFamilyName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFamilyName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpFaceName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFaceName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpStyleName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpStyleName), -1, NULL, 0, NULL, NULL); if(lpOTMW->otmpFullName) needed += WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFullName), -1, NULL, 0, NULL, NULL); if(!lpOTM) { @@ -1090,7 +1090,7 @@ if(lpOTMW->otmpFamilyName) { output->otmpFamilyName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFamilyName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1100,7 +1100,7 @@ if(lpOTMW->otmpFaceName) { output->otmpFaceName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFaceName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1110,7 +1110,7 @@ if(lpOTMW->otmpStyleName) { output->otmpStyleName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpStyleName), -1, ptr, left, NULL, NULL); left -= len; ptr += len; @@ -1120,7 +1120,7 @@ if(lpOTMW->otmpFullName) { output->otmpFullName = (LPSTR)(ptr - (char*)output); len = WideCharToMultiByte(CP_ACP, 0, - (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1, + (WCHAR*)((char*)lpOTMW + (ptrdiff_t)lpOTMW->otmpFullName), -1, ptr, left, NULL, NULL); left -= len; } else Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Fri Oct 30 01:24:32 2009 @@ -142,7 +142,7 @@ WINAPI CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); + return (HRGN) NtGdiPolyPolyDraw( ULongToPtr(fnPolyFillMode), (PPOINT) lppt, (PULONG) &cPoints, 1, GdiPolyPolyRgn); } @@ -156,7 +156,7 @@ int nCount, int fnPolyFillMode) { - return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); + return (HRGN) NtGdiPolyPolyDraw( ULongToHandle(fnPolyFillMode), (PPOINT) lppt, (PULONG) lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn ); }

1 0

[sserapion] 43841: Fix some prototypes.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 01:22:42 2009 New Revision: 43841 URL: http://svn.reactos.org/svn/reactos?rev=43841&view=rev Log: Fix some prototypes. Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] Fri Oct 30 01:22:42 2009 @@ -2794,7 +2794,7 @@ IN HDC hdc, IN ULONG_PTR idEnum, IN ULONG cjEfdw, - OUT ULONG *pcjEfdw, + OUT ULONG_PTR *pcjEfdw, OUT PENUMFONTDATAW pefdw ); #endif @@ -2809,7 +2809,7 @@ IN ULONG cwchMax, IN OPTIONAL LPWSTR pwszFaceName, IN ULONG lfCharSet, - OUT ULONG *pulCount + OUT ULONG_PTR *pulCount ); W32KAPI

1 0

← Newer
1
2
3
4
5
6
7
8
...
65
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 October 2009