Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[jgardou] 48680: [WIN32K] - Use newly introduced macros and get rid of related functions - Ignore alpha channels of solid brush color
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 16:52:23 2010 New Revision: 48680 URL: http://svn.reactos.org/svn/reactos?rev=48680&view=rev Log: [WIN32K] - Use newly introduced macros and get rid of related functions - Ignore alpha channels of solid brush color Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -158,7 +158,7 @@ // These functions are assigned if we're working with a DIB // The assigned functions depend on the bitsPerPixel of the DIB - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? pbo->iSolidColor : 0); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? (pbo->iSolidColor &0x00ffffff): 0); return TRUE; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -144,7 +144,7 @@ ULONG lWidth; /* Calculate width in bytes of the realized brush */ - lWidth = DIB_GetDIBWidthBytes(psoPattern->sizlBitmap.cx, + lWidth = WIDTH_BYTES_ALIGN32(psoPattern->sizlBitmap.cx, BitsPerFormat(psoDst->iBitmapFormat)); /* Allocate a bitmap */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -64,7 +64,7 @@ /* Allocate a temporary bitmap */ BitmapSize.cx = DestRect->right - DestRect->left; BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(psoDest->iBitmapFormat)); + Width = WIDTH_BYTES_ALIGN32(BitmapSize.cx, BitsPerFormat(psoDest->iBitmapFormat)); EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, psoDest->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -334,7 +334,7 @@ rectl.bottom = sizel.cy; /* Calculate lDelta for our surfaces. */ - lDelta = DIB_GetDIBWidthBytes(sizel.cx, + lDelta = WIDTH_BYTES_ALIGN32(sizel.cx, BitsPerFormat(pso->iBitmapFormat)); /* Create a bitmap for saving the pixels under the cursor. */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -12,7 +12,6 @@ HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); -INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); HBITMAP APIENTRY Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -11,8 +11,6 @@ LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ); INT APIENTRY DIB_GetDIBImageBytes (INT width, INT height, INT depth); -INT FASTCALL -DIB_GetDIBWidthBytes (INT width, INT depth); HPALETTE FASTCALL DIB_MapPaletteColors(PPALETTE ppal, CONST BITMAPINFO* lpbmi); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -55,7 +55,7 @@ pjDst = psurf->SurfObj.pvScan0; pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; - lDeltaSrc = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); while (nHeight--) { @@ -186,7 +186,7 @@ } /* Make sure that cjBits will not overflow */ - cjWidthBytes = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", @@ -581,7 +581,7 @@ pjSrc = psurf->SurfObj.pvScan0; pjDst = pvBits; lDeltaSrc = psurf->SurfObj.lDelta; - lDeltaDst = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + lDeltaDst = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); while (nHeight--) { @@ -613,7 +613,7 @@ return 0; } - bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx, + bmSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * abs(psurf->SurfObj.sizlBitmap.cy); @@ -858,40 +858,6 @@ return 0; } -INT FASTCALL -BITMAP_GetWidthBytes(INT bmWidth, INT bpp) -{ -#if 0 - switch (bpp) - { - case 1: - return 2 * ((bmWidth+15) >> 4); - - case 24: - bmWidth *= 3; /* fall through */ - case 8: - return bmWidth + (bmWidth & 1); - - case 32: - return bmWidth * 4; - - case 16: - case 15: - return bmWidth * 2; - - case 4: - return 2 * ((bmWidth+3) >> 2); - - default: - DPRINT ("stub"); - } - - return -1; -#endif - - return ((bmWidth * bpp + 15) & ~15) >> 3; -} - HBITMAP FASTCALL BITMAP_CopyBitmap(HBITMAP hBitmap) { @@ -963,7 +929,7 @@ pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy; pBitmap->bmPlanes = 1; pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - pBitmap->bmWidthBytes = BITMAP_GetWidthBytes(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); /* Check for DIB section */ if (psurf->hSecure) @@ -971,7 +937,7 @@ /* Set bmBits in this case */ pBitmap->bmBits = psurf->SurfObj.pvBits; /* DIBs data are 32 bits aligned */ - pBitmap->bmWidthBytes = DIB_GetDIBWidthBytes(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); if (Count >= sizeof(DIBSECTION)) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -480,7 +480,7 @@ SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, @@ -1390,7 +1390,7 @@ bm.bmType = 0; bm.bmWidth = bi->biWidth; bm.bmHeight = effHeight; - bm.bmWidthBytes = ovr_pitch ? ovr_pitch : (ULONG) DIB_GetDIBWidthBytes(bm.bmWidth, bi->biBitCount); + bm.bmWidthBytes = ovr_pitch ? ovr_pitch : WIDTH_BYTES_ALIGN32(bm.bmWidth, bi->biBitCount); bm.bmPlanes = bi->biPlanes; bm.bmBitsPixel = bi->biBitCount; @@ -1603,18 +1603,6 @@ } /*********************************************************************** - * DIB_GetDIBWidthBytes - * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. - * http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/struc/src/str01.h… - * 11/16/1999 (RJJ) lifted from wine - */ -INT FASTCALL DIB_GetDIBWidthBytes(INT width, INT depth) -{ - return ((width * depth + 31) & ~31) >> 3; -} - -/*********************************************************************** * DIB_GetDIBImageBytes * * Return the number of bytes used to hold the image in a DIB bitmap. @@ -1623,7 +1611,7 @@ INT APIENTRY DIB_GetDIBImageBytes(INT width, INT height, INT depth) { - return DIB_GetDIBWidthBytes(width, depth) * (height < 0 ? -height : height); + return WIDTH_BYTES_ALIGN32(width, depth) * (height < 0 ? -height : height); } /***********************************************************************

1 0

[fireball] 48679: - Sync up to Wine-1.3.1. - Merge 48678 from trunk.
by fireball＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: fireball Date: Wed Sep 1 13:46:19 2010 New Revision: 48679 URL: http://svn.reactos.org/svn/reactos?rev=48679&view=rev Log: - Sync up to Wine-1.3.1. - Merge 48678 from trunk. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/ (props changed) branches/arwinss/reactos/boot/bootdata/packages/reactos.dff (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/ (props changed) branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/dc.c branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/init.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c branches/arwinss/reactos/dll/win32/kernel32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/kernel32/misc/console.c (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/button.c branches/arwinss/reactos/dll/win32/user32/class.c branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg branches/arwinss/reactos/dll/win32/version/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/settings.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/xdnd.c branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/include/psdk/wingdi.h (props changed) branches/arwinss/reactos/include/psdk/winuser.h (contents, props changed) branches/arwinss/reactos/include/reactos/subsys/ (props changed) branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/subsystems/win32/csrss/ (props changed) branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c (contents, props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/user32/button.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xdnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

1 0

[fireball] 48678: [PSDK] - Add BS_TYPEMASK definition.
by fireball＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: fireball Date: Wed Sep 1 13:40:35 2010 New Revision: 48678 URL: http://svn.reactos.org/svn/reactos?rev=48678&view=rev Log: [PSDK] - Add BS_TYPEMASK definition. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Sep 1 13:40:35 2010 @@ -269,6 +269,7 @@ #define BS_MULTILINE 0x2000 #define BS_NOTIFY 0x4000 #define BS_OWNERDRAW 0xb +#define BS_TYPEMASK 0xFL #define BS_PUSHBUTTON 0 #define BS_PUSHLIKE 4096 #define BS_RADIOBUTTON 4

1 0

[fireball] 48677: [VENDOR/WINE] - Import Wine-1.3.1 gdi32, user32, winex11.drv, server.
by fireball＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: fireball Date: Wed Sep 1 13:20:41 2010 New Revision: 48677 URL: http://svn.reactos.org/svn/reactos?rev=48677&view=rev Log: [VENDOR/WINE] - Import Wine-1.3.1 gdi32, user32, winex11.drv, server. Modified: vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/enhmfdrv/init.c vendor/wine/dlls/gdi32/current/font.c vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/gdiobj.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/gdiobj.c vendor/wine/dlls/user32/current/button.c vendor/wine/dlls/user32/current/class.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/resources/oic_bang.svg vendor/wine/dlls/user32/current/resources/oic_hand.svg vendor/wine/dlls/user32/current/resources/oic_note.svg vendor/wine/dlls/user32/current/resources/oic_ques.svg vendor/wine/dlls/user32/current/resources/oic_sample.svg vendor/wine/dlls/user32/current/tests/class.c vendor/wine/dlls/user32/current/tests/cursoricon.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/winex11.drv/current/Makefile.in vendor/wine/dlls/winex11.drv/current/settings.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/xdnd.c vendor/wine/server/current/sock.c vendor/wine/server/current/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/enhmfdrv/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmfdrv/… Modified: vendor/wine/dlls/gdi32/current/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/font.c?re… Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… Modified: vendor/wine/dlls/gdi32/current/gdiobj.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdiobj.c?… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Modified: vendor/wine/dlls/gdi32/current/tests/gdiobj.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/gdi… Modified: vendor/wine/dlls/user32/current/button.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/button.c… Modified: vendor/wine/dlls/user32/current/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/class.c?… Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… Modified: vendor/wine/dlls/user32/current/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/tests/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cl… Modified: vendor/wine/dlls/user32/current/tests/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cu… Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… Modified: vendor/wine/dlls/winex11.drv/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/Mak… Modified: vendor/wine/dlls/winex11.drv/current/settings.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/set… Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/xdnd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xdn… Modified: vendor/wine/server/current/sock.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/sock.c?rev=48… Modified: vendor/wine/server/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/window.c?rev=…

1 0

[tkreuzer] 48676: fix msc/intrin.h
by tkreuzer＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: tkreuzer Date: Wed Sep 1 13:19:29 2010 New Revision: 48676 URL: http://svn.reactos.org/svn/reactos?rev=48676&view=rev Log: fix msc/intrin.h Modified: branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h Modified: branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h [iso-8859-1] Wed Sep 1 13:19:29 2010 @@ -21,11 +21,14 @@ void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) +char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); #pragma intrinsic(_InterlockedCompareExchange8) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); #pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) +#if defined(_AMD64_) || defined(_IA64_) +void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); #pragma intrinsic(_InterlockedCompareExchangePointer) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); #pragma intrinsic(_InterlockedExchangePointer)

1 0

[tkreuzer] 48675: Add macros WIDTH_BYTES_ALIGN16/32
by tkreuzer＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: tkreuzer Date: Wed Sep 1 12:04:31 2010 New Revision: 48675 URL: http://svn.reactos.org/svn/reactos?rev=48675&view=rev Log: Add macros WIDTH_BYTES_ALIGN16/32 Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Wed Sep 1 12:04:31 2010 @@ -200,17 +200,16 @@ cBitsPixel = gajBitsPerFormat[pso->iBitmapFormat]; /* Is a width in bytes given? */ - if (!ulWidth) - { - /* Calculate width from the bitmap width in pixels */ - ulWidth = DIB_GetDIBWidthBytes(psurf->SurfObj.sizlBitmap.cx, cBitsPixel); + if (ulWidth) + { + /* Align the width (Windows compatibility, drivers expect that) */ + ulWidth = WIDTH_BYTES_ALIGN32((ulWidth << 3) / cBitsPixel, cBitsPixel); } else { - /* Align the width (windows compatibility, drivers expect that) */ - ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + /* Calculate width from the bitmap width in pixels */ + ulWidth = WIDTH_BYTES_ALIGN32(pso->sizlBitmap.cx, cBitsPixel); } - /* Calculate the bitmap size in bytes */ pso->cjBits = ulWidth * pso->sizlBitmap.cy; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Wed Sep 1 12:04:31 2010 @@ -128,3 +128,7 @@ ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression); extern UCHAR gajBitsPerFormat[]; #define BitsPerFormat(Format) gajBitsPerFormat[Format] + +#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3) +#define WIDTH_BYTES_ALIGN16(cx, bpp) ((((cx) * (bpp) + 15) & ~15) >> 3) +

1 0

[jgardou] 48674: [WIN32K] - Giannis Adamopoulos : "Something is missing here"
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 11:28:50 2010 New Revision: 48674 URL: http://svn.reactos.org/svn/reactos?rev=48674&view=rev Log: [WIN32K] - Giannis Adamopoulos : "Something is missing here" Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Wed Sep 1 11:28:50 2010 @@ -208,7 +208,7 @@ else { /* Align the width (windows compatibility, drivers expect that) */ - ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; }

1 0

[jgardou] 48673: [USER32] - Use Screen capabilities to create icons bitmaps.
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 10:56:10 2010 New Revision: 48673 URL: http://svn.reactos.org/svn/reactos?rev=48673&view=rev Log: [USER32] - Use Screen capabilities to create icons bitmaps. Modified: branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c Modified: branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Wed Sep 1 10:56:10 2010 @@ -458,10 +458,16 @@ void *color_bits, *mask_bits; BOOL ret = FALSE; HDC hdc = 0; + static HDC hScreenDC = 0; if (!(info = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] ))))) return FALSE; - if (!(hdc = CreateCompatibleDC( 0 ))) goto done; + if(!hScreenDC) + { + hScreenDC = GetDC(0); + if(!hScreenDC) goto done; + } + if (!(hdc = CreateCompatibleDC(hScreenDC))) goto done; memcpy( info, bmi, size ); info->bmiHeader.biHeight /= 2; @@ -485,8 +491,8 @@ else { if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(*color = CreateBitmap( width, height, bmi->bmiHeader.biPlanes, - bmi->bmiHeader.biBitCount, NULL ))) + if (!(*color = CreateBitmap( width, height, GetDeviceCaps(hScreenDC, PLANES), + GetDeviceCaps(hScreenDC, BITSPIXEL), NULL ))) { DeleteObject( *mask ); goto done; @@ -523,7 +529,7 @@ ret = TRUE; done: - DeleteDC( hdc ); + if(hdc) DeleteDC( hdc ); HeapFree( GetProcessHeap(), 0, info ); return ret; }

1 0

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 September 2010