Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[fireball] 50294: - Move font related routines to font.c. - Remove ROS_DCINFO structure and all related stuff. It's totally unnecessary, since coordinate transformation is done in usermode.
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

Author: fireball Date: Wed Jan 5 23:18:00 2011 New Revision: 50294 URL: http://svn.reactos.org/svn/reactos?rev=50294&view=rev Log: - Move font related routines to font.c. - Remove ROS_DCINFO structure and all related stuff. It's totally unnecessary, since coordinate transformation is done in usermode. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Jan 5 23:18:00 2011 @@ -653,4 +653,52 @@ return retv; } +BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, + const INT *lpDx ) +{ + //if (physDev->has_gdi_font) + return FeTextOut(physDev, x, y, flags, lprect, wstr, count, lpDx); + + //UNIMPLEMENTED; + //return FALSE; +} + +BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) +{ + /* Let GDI font engine do the work */ + return FALSE; +} + +BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, + FONTENUMPROCW proc, LPARAM lp ) +{ + /* We're always using client-side fonts. */ + return FALSE; +} + +HFONT CDECL RosDrv_SelectFont( NTDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) +{ + /* We don't have a kernelmode font engine */ + if (gdiFont == 0) + { + /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ + } + else + { + /* Save information about the selected font */ + FeSelectFont(physDev, hfont); + } + + /* Indicate that gdiFont is good to use */ + return 0; +} + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Wed Jan 5 23:18:00 2011 @@ -36,8 +36,7 @@ LPCWSTR output, const DEVMODEW* initData ) { BOOL bRet; - double scaleX, scaleY; - ROS_DCINFO dcInfo = {0}; + DWORD dcType; NTDRV_PDEVICE *physDev; HDC hKernelDC; @@ -45,50 +44,15 @@ physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ); if (!physDev) return FALSE; - /* Fill in internal DCINFO structure */ - dcInfo.dwType = GetObjectType(hdc); - GetWorldTransform(hdc, &dcInfo.xfWorld2Wnd); - GetViewportExtEx(hdc, &dcInfo.szVportExt); - GetViewportOrgEx(hdc, &dcInfo.ptVportOrg); - GetWindowExtEx(hdc, &dcInfo.szWndExt); - GetWindowOrgEx(hdc, &dcInfo.ptWndOrg); - - /* Calculate xfWnd2Vport */ - scaleX = (double)dcInfo.szVportExt.cx / (double)dcInfo.szWndExt.cx; - scaleY = (double)dcInfo.szVportExt.cy / (double)dcInfo.szWndExt.cy; - dcInfo.xfWnd2Vport.eM11 = scaleX; - dcInfo.xfWnd2Vport.eM12 = 0.0; - dcInfo.xfWnd2Vport.eM21 = 0.0; - dcInfo.xfWnd2Vport.eM22 = scaleY; - dcInfo.xfWnd2Vport.eDx = (double)dcInfo.ptVportOrg.x - - scaleX * (double)dcInfo.ptWndOrg.x; - dcInfo.xfWnd2Vport.eDy = (double)dcInfo.ptVportOrg.y - - scaleY * (double)dcInfo.ptWndOrg.y; - - /* The following part is done in kernel mode */ -#if 0 - /* Combine with the world transformation */ - CombineTransform( &dc->xformWorld2Vport, &dc->xformWorld2Wnd, - &xformWnd2Vport ); - - /* Create inverse of world-to-viewport transformation */ - dc->vport2WorldValid = DC_InvertXform( &dc->xformWorld2Vport, - &dc->xformVport2World ); -#endif - - /* Save DC handle if it's a compatible one or set it to NULL for - a display DC */ - if (*pdev) - hKernelDC = (*pdev)->hKernelDC; - else - hKernelDC = 0; + /* Get DC type */ + dcType = GetObjectType(hdc); /* Save stock bitmap's handle */ - if (dcInfo.dwType == OBJ_MEMDC && !hStockBitmap) + if (dcType == OBJ_MEMDC && !hStockBitmap) hStockBitmap = GetCurrentObject( hdc, OBJ_BITMAP ); /* Call the win32 kernel */ - bRet = RosGdiCreateDC(&dcInfo, &hKernelDC, driver, device, output, initData); + bRet = RosGdiCreateDC(&hKernelDC, driver, device, output, initData, dcType); /* Save newly created DC */ physDev->hKernelDC = hKernelDC; @@ -127,13 +91,6 @@ /* Return result */ return res; -} - -BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ) -{ - /* We're always using client-side fonts. */ - return FALSE; } INT CDECL RosDrv_ExtEscape( NTDRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data, @@ -174,17 +131,6 @@ return 0; } -BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx ) -{ - //if (physDev->has_gdi_font) - return FeTextOut(physDev, x, y, flags, lprect, wstr, count, lpDx); - - //UNIMPLEMENTED; - //return FALSE; -} - LONG CDECL RosDrv_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) { return RosGdiGetBitmapBits(hbitmap, buffer, count); @@ -220,19 +166,6 @@ return RosGdiGetSystemPaletteEntries(physDev->hKernelDC, start, count, entries); } -BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) -{ - /* Let GDI font engine do the work */ - return FALSE; -} - UINT CDECL RosDrv_RealizeDefaultPalette( NTDRV_PDEVICE *physDev ) { //UNIMPLEMENTED; @@ -271,23 +204,6 @@ RosGdiSelectBrush(physDev->hKernelDC, &logbrush); return hbrush; -} - -HFONT CDECL RosDrv_SelectFont( NTDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) -{ - /* We don't have a kernelmode font engine */ - if (gdiFont == 0) - { - /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ - } - else - { - /* Save information about the selected font */ - FeSelectFont(physDev, hfont); - } - - /* Indicate that gdiFont is good to use */ - return 0; } HPEN CDECL RosDrv_SelectPen( NTDRV_PDEVICE *physDev, HPEN hpen )

1 0

[fireball] 50293: - More code cleanup: put GDI code into appropriate places.
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

Author: fireball Date: Wed Jan 5 22:39:38 2011 New Revision: 50293 URL: http://svn.reactos.org/svn/reactos?rev=50293&view=rev Log: - More code cleanup: put GDI code into appropriate places. Modified: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c branches/arwinss/reactos/dll/win32/winent.drv/dib.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/graphics.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -16,4 +16,162 @@ /* FUNCTIONS **************************************************************/ +BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) +{ + POINT pts[2], ptBrush; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); +} + +BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height, NTDRV_PDEVICE *physDevSrc, + INT xSrc, INT ySrc, DWORD rop ) +{ + BOOL useSrc; + POINT pts[2], ptBrush; + + useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); + if (!physDevSrc && useSrc) return FALSE; + + /* Forward to PatBlt if src dev is missing */ + if (!physDevSrc) + return RosDrv_PatBlt(physDevDst, xDst, yDst, width, height, rop); + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + width; + pts[1].y = ySrc + height; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + LPtoDP(physDevDst->hUserDC, pts, 1); + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", + // xDst, yDst, width, height, xSrc, ySrc); + + return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, + physDevSrc->hKernelDC, xSrc, ySrc, rop); +} + +BOOL CDECL RosDrv_StretchBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT widthDst, INT heightDst, + NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + INT widthSrc, INT heightSrc, DWORD rop ) +{ + BOOL useSrc; + POINT pts[2], ptBrush; + + useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); + if (!physDevSrc && useSrc) return FALSE; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); +} + +BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + BLENDFUNCTION blendfn) +{ + POINT pts[2], ptBrush; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiAlphaBlend(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, blendfn); + +} + + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -4,6 +4,7 @@ * FILE: dll/win32/winent.drv/bitblt.c * PURPOSE: GDI driver stub for ReactOS/Windows * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * Some code is taken from winex11.drv (c) Wine project */ /* INCLUDES ***************************************************************/ @@ -15,4 +16,207 @@ /* FUNCTIONS **************************************************************/ +/*********************************************************************** + * DIB_GetBitmapInfoEx + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +static int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, + WORD *compr, DWORD *size ) +{ + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + if (header->biSize >= sizeof(BITMAPINFOHEADER)) + { + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + ERR("(%d): unknown/wrong size for header\n", header->biSize ); + return -1; +} + +/*********************************************************************** + * DIB_GetBitmapInfo + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *bpp, WORD *compr ) +{ + WORD planes; + DWORD size; + + return DIB_GetBitmapInfoEx( header, width, height, &planes, bpp, compr, &size); +} + +INT DIB_GetDIBWidthBytes(INT width, INT depth) +{ + return ((width * depth + 31) & ~31) >> 3; +} + +INT CDECL RosDrv_SetDIBitsToDevice( NTDRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx, + DWORD cy, INT xSrc, INT ySrc, + UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ) +{ + BOOL top_down; + LONG height, width; + WORD infoBpp, compression; + POINT pt; + + pt.x = xDest; pt.y = yDest; + LPtoDP(physDev->hUserDC, &pt, 1); + + /* Perform extensive parameter checking */ + if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &infoBpp, &compression ) == -1) + return 0; + + top_down = (height < 0); + if (top_down) height = -height; + + if (!lines || (startscan >= height)) return 0; + if (!top_down && startscan + lines > height) lines = height - startscan; + + /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, + * and clamp all values to fit inside [startscan,startscan+lines] + */ + if (ySrc + cy <= startscan + lines) + { + UINT y = startscan + lines - (ySrc + cy); + if (ySrc < startscan) cy -= (startscan - ySrc); + if (!top_down) + { + /* avoid getting unnecessary lines */ + ySrc = 0; + if (y >= lines) return 0; + lines -= y; + } + else + { + if (y >= lines) return lines; + ySrc = y; /* need to get all lines in top down mode */ + } + } + else + { + if (ySrc >= startscan + lines) return lines; + pt.y += ySrc + cy - (startscan + lines); + cy = startscan + lines - ySrc; + ySrc = 0; + if (cy > lines) cy = lines; + } + if (xSrc >= width) return lines; + if (xSrc + cx >= width) cx = width - xSrc; + if (!cx || !cy) return lines; + + return RosGdiSetDIBitsToDevice(physDev->hKernelDC, pt.x, pt.y, cx, cy, + xSrc, ySrc, startscan, top_down ? -lines : lines, bits, info, coloruse); +} + +INT CDECL RosDrv_SetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, + UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) +{ + LONG height, width, tmpheight; + WORD infoBpp, compression; + PVOID safeBits = NULL; + INT result, bitsSize; + + /* Perform extensive parameter checking */ + if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &infoBpp, &compression ) == -1) + return 0; + + tmpheight = height; + if (height < 0) height = -height; + if (!lines || (startscan >= height)) + return 0; + + if (startscan + lines > height) lines = height - startscan; + + /* Create a safe copy of bits */ + bitsSize = DIB_GetDIBWidthBytes( width, infoBpp ) * height; + + if ( bits ) + { + safeBits = HeapAlloc( GetProcessHeap(), 0, bitsSize ); + if (safeBits) + { + _SEH2_TRY + { + RtlCopyMemory( safeBits, bits, bitsSize ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("StretchDIBits failed to read bits 0x%p, size: %d\n", bits, bitsSize); + } + _SEH2_END + } + } + + result = RosGdiSetDIBits(physDev->hKernelDC, hbitmap, startscan, + lines, safeBits, info, coloruse); + + /* Free safe copy of bits */ + if ( safeBits ) + HeapFree( GetProcessHeap(), 0, safeBits ); + + return result; +} + +INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPVOID bits, BITMAPINFO *info, UINT coloruse ) +{ + size_t obj_size; + DIBSECTION dib; + + /* Check if this bitmap has a DIB section */ + if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; + + /* Perform GetDIBits */ + return RosGdiGetDIBits(physDev->hKernelDC, hbitmap, startscan, lines, bits, info, coloruse, &dib); +} + +HBITMAP CDECL RosDrv_CreateDIBSection( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, + const BITMAPINFO *bmi, UINT usage ) +{ + DIBSECTION dib; + LONG height, width; + WORD infoBpp, compression; + + GetObjectW( hbitmap, sizeof(dib), &dib ); + + /* Get parameters to check if it's topdown or not. + GetObject doesn't return this info */ + DIB_GetBitmapInfo(&bmi->bmiHeader, &width, &height, &infoBpp, &compression); + + // TODO: Should pass as a flag instead + if (height < 0) dib.dsBmih.biHeight *= -1; + + return RosGdiCreateDIBSection(physDev->hKernelDC, hbitmap, bmi, usage, &dib); +} + +UINT CDECL RosDrv_SetDIBColorTable( NTDRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors ) +{ + return RosGdiSetDIBColorTable(physDev->hKernelDC, start, count, colors); +} + + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -46,44 +46,6 @@ #endif /* FUNCTIONS **************************************************************/ - -/*********************************************************************** - * RosDrv_XWStoDS - * - * Performs a world-to-viewport transformation on the specified width. - * Copyright 1993,1994 Alexandre Julliard - * Copyright 1998 Huw Davies - */ -INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ) -{ - POINT pt[2]; - - pt[0].x = 0; - pt[0].y = 0; - pt[1].x = width; - pt[1].y = 0; - LPtoDP( physDev->hUserDC, pt, 2 ); - return pt[1].x - pt[0].x; -} - -/*********************************************************************** - * RosDrv_YWStoDS - * - * Performs a world-to-viewport transformation on the specified height. - * Copyright 1993,1994 Alexandre Julliard - * Copyright 1998 Huw Davies - */ -INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ) -{ - POINT pt[2]; - - pt[0].x = 0; - pt[0].y = 0; - pt[1].x = 0; - pt[1].y = height; - LPtoDP( physDev->hUserDC, pt, 2 ); - return pt[1].y - pt[0].y; -} /* from winex11/xrender.c * Copyright 2001, 2002 Huw D M Davies for CodeWeavers Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -17,171 +17,6 @@ HANDLE hStockBitmap; /* FUNCTIONS **************************************************************/ - -BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ); - -/* get the rectangle in device coordinates, with optional mirroring */ -static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) -{ - RECT rect; - - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; - if (GetLayout( hdc ) & LAYOUT_RTL) - { - /* shift the rectangle so that the right border is included after mirroring */ - /* it would be more correct to do this after LPtoDP but that's not what Windows does */ - rect.left--; - rect.right--; - } - LPtoDP( hdc, (POINT *)&rect, 2 ); - if (rect.left > rect.right) - { - int tmp = rect.left; - rect.left = rect.right; - rect.right = tmp; - } - if (rect.top > rect.bottom) - { - int tmp = rect.top; - rect.top = rect.bottom; - rect.bottom = tmp; - } - return rect; -} - -BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - BLENDFUNCTION blendfn) -{ - POINT pts[2], ptBrush; - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - - LPtoDP(physDevDst->hUserDC, pts, 2); - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiAlphaBlend(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, blendfn); - -} - -BOOL CDECL RosDrv_Arc( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - POINT pts[4]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, - pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeArc); -} - -BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, NTDRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ) -{ - BOOL useSrc; - POINT pts[2], ptBrush; - - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - - /* Forward to PatBlt if src dev is missing */ - if (!physDevSrc) - return RosDrv_PatBlt(physDevDst, xDst, yDst, width, height, rop); - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + width; - pts[1].y = ySrc + height; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - LPtoDP(physDevDst->hUserDC, pts, 1); - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", - // xDst, yDst, width, height, xSrc, ySrc); - - return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, - physDevSrc->hKernelDC, xSrc, ySrc, rop); -} - -BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - POINT pts[4]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, - pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeChord ); -} BOOL CDECL RosDrv_CreateBitmap( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits ) { @@ -272,25 +107,6 @@ return bRet; } -HBITMAP CDECL RosDrv_CreateDIBSection( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage ) -{ - DIBSECTION dib; - LONG height, width; - WORD infoBpp, compression; - - GetObjectW( hbitmap, sizeof(dib), &dib ); - - /* Get parameters to check if it's topdown or not. - GetObject doesn't return this info */ - DIB_GetBitmapInfo(&bmi->bmiHeader, &width, &height, &infoBpp, &compression); - - // TODO: Should pass as a flag instead - if (height < 0) dib.dsBmih.biHeight *= -1; - - return RosGdiCreateDIBSection(physDev->hKernelDC, hbitmap, bmi, usage, &dib); -} - BOOL CDECL RosDrv_DeleteBitmap( HBITMAP hbitmap ) { return RosGdiDeleteBitmap(hbitmap); @@ -311,21 +127,6 @@ /* Return result */ return res; -} - -BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) -{ - POINT pts[2]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - - LPtoDP(physDev->hUserDC, pts, 2); - - return RosGdiEllipse(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y); } BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, @@ -373,19 +174,6 @@ return 0; } -BOOL CDECL RosDrv_ExtFloodFill( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, - UINT fillType ) -{ - POINT ptPixel; - - /* Transform to device coordinates */ - ptPixel.x = x; ptPixel.y = y; - - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiExtFloodFill(physDev->hKernelDC, ptPixel.x, ptPixel.y, color, fillType); -} - BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) @@ -409,19 +197,6 @@ return FALSE; } -INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) -{ - size_t obj_size; - DIBSECTION dib; - - /* Check if this bitmap has a DIB section */ - if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; - - /* Perform GetDIBits */ - return RosGdiGetDIBits(physDev->hKernelDC, hbitmap, startscan, lines, bits, info, coloruse, &dib); -} - INT CDECL RosDrv_GetDeviceCaps( NTDRV_PDEVICE *physDev, INT cap ) { return RosGdiGetDeviceCaps(physDev->hKernelDC, cap); @@ -433,33 +208,10 @@ return FALSE; } -BOOL CDECL RosDrv_GetICMProfile( NTDRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) -{ - UNIMPLEMENTED; - return FALSE; -} - -INT CDECL RosDrv_EnumICMProfiles( NTDRV_PDEVICE *physDev, ICMENUMPROCW proc, LPARAM lparam ) -{ - UNIMPLEMENTED; - return 0; -} - COLORREF CDECL RosDrv_GetNearestColor( NTDRV_PDEVICE *physDev, COLORREF color ) { UNIMPLEMENTED; return 0; -} - -COLORREF CDECL RosDrv_GetPixel( NTDRV_PDEVICE *physDev, INT x, INT y ) -{ - POINT ptPixel; - - /* Transform to device coordinates */ - ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); } UINT CDECL RosDrv_GetSystemPaletteEntries( NTDRV_PDEVICE *physDev, UINT start, UINT count, @@ -481,140 +233,6 @@ return FALSE; } -BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) -{ - POINT pt[2]; - - /* Get current cursor position */ - GetCurrentPositionEx( physDev->hUserDC, &pt[0] ); - - /* Convert both points coordinates to device */ - pt[1].x = x; - pt[1].y = y; - LPtoDP( physDev->hUserDC, pt, 2 ); - - /* Draw the line */ - return RosGdiLineTo(physDev->hKernelDC, pt[0].x, pt[0].y, pt[1].x, pt[1].y); -} - -BOOL CDECL RosDrv_PaintRgn( NTDRV_PDEVICE *physDev, HRGN hrgn ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) -{ - POINT pts[2], ptBrush; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = left + width; - pts[1].y = top + height; - - LPtoDP(physDev->hUserDC, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - left = pts[0].x; - top = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); -} - -BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - POINT pts[4]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, - pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypePie); -} - -BOOL CDECL RosDrv_PolyPolygon( NTDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_PolyPolyline( NTDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_Polygon( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) -{ - register int i; - POINT *points; - POINT ptBrush; - - if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) - { - WARN("No memory to convert POINTs!\n"); - return FALSE; - } - for (i = 0; i < count; i++) - { - POINT tmp = pt[i]; - LPtoDP(physDev->hUserDC, &tmp, 1); - points[i].x = tmp.x; - points[i].y = tmp.y; - } - points[count] = points[0]; - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - /* Call kernel mode */ - RosGdiPolygon(physDev->hKernelDC, points, count+1); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; -} - -BOOL CDECL RosDrv_Polyline( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) -{ - register int i; - POINT *points; - - if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * count ))) - { - WARN("No memory to convert POINTs!\n"); - return FALSE; - } - for (i = 0; i < count; i++) - { - POINT tmp = pt[i]; - LPtoDP(physDev->hUserDC, &tmp, 1); - points[i].x = tmp.x; - points[i].y = tmp.y; - } - - /* Call kernel mode */ - RosGdiPolyline(physDev->hKernelDC, points, count); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; -} - UINT CDECL RosDrv_RealizeDefaultPalette( NTDRV_PDEVICE *physDev ) { //UNIMPLEMENTED; @@ -622,32 +240,6 @@ } UINT CDECL RosDrv_RealizePalette( NTDRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) -{ - POINT ptBrush; - RECT rc = get_device_rect( physDev->hUserDC, left, top, right, bottom ); - - if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; - - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - RosGdiRectangle(physDev->hKernelDC, &rc); - - return TRUE; -} - -BOOL CDECL RosDrv_RoundRect( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) { UNIMPLEMENTED; return FALSE; @@ -736,11 +328,6 @@ return 0; } -COLORREF CDECL RosDrv_SetBkColor( NTDRV_PDEVICE *physDev, COLORREF color ) -{ - return RosGdiSetBkColor(physDev->hKernelDC, color); -} - COLORREF CDECL RosDrv_SetDCBrushColor( NTDRV_PDEVICE *physDev, COLORREF crColor ) { UNIMPLEMENTED; @@ -753,279 +340,16 @@ return 0; } -UINT CDECL RosDrv_SetDIBColorTable( NTDRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors ) -{ - return RosGdiSetDIBColorTable(physDev->hKernelDC, start, count, colors); -} - -INT CDECL RosDrv_SetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) -{ - LONG height, width, tmpheight; - WORD infoBpp, compression; - PVOID safeBits = NULL; - INT result, bitsSize; - - /* Perform extensive parameter checking */ - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, - &infoBpp, &compression ) == -1) - return 0; - - tmpheight = height; - if (height < 0) height = -height; - if (!lines || (startscan >= height)) - return 0; - - if (startscan + lines > height) lines = height - startscan; - - /* Create a safe copy of bits */ - bitsSize = DIB_GetDIBWidthBytes( width, infoBpp ) * height; - - if ( bits ) - { - safeBits = HeapAlloc( GetProcessHeap(), 0, bitsSize ); - if (safeBits) - { - _SEH2_TRY - { - RtlCopyMemory( safeBits, bits, bitsSize ); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("StretchDIBits failed to read bits 0x%p, size: %d\n", bits, bitsSize); - } - _SEH2_END - } - } - - result = RosGdiSetDIBits(physDev->hKernelDC, hbitmap, startscan, - lines, safeBits, info, coloruse); - - /* Free safe copy of bits */ - if ( safeBits ) - HeapFree( GetProcessHeap(), 0, safeBits ); - - return result; -} - -INT CDECL RosDrv_SetDIBitsToDevice( NTDRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ) -{ - BOOL top_down; - LONG height, width; - WORD infoBpp, compression; - POINT pt; - - pt.x = xDest; pt.y = yDest; - LPtoDP(physDev->hUserDC, &pt, 1); - - /* Perform extensive parameter checking */ - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, - &infoBpp, &compression ) == -1) - return 0; - - top_down = (height < 0); - if (top_down) height = -height; - - if (!lines || (startscan >= height)) return 0; - if (!top_down && startscan + lines > height) lines = height - startscan; - - /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, - * and clamp all values to fit inside [startscan,startscan+lines] - */ - if (ySrc + cy <= startscan + lines) - { - UINT y = startscan + lines - (ySrc + cy); - if (ySrc < startscan) cy -= (startscan - ySrc); - if (!top_down) - { - /* avoid getting unnecessary lines */ - ySrc = 0; - if (y >= lines) return 0; - lines -= y; - } - else - { - if (y >= lines) return lines; - ySrc = y; /* need to get all lines in top down mode */ - } - } - else - { - if (ySrc >= startscan + lines) return lines; - pt.y += ySrc + cy - (startscan + lines); - cy = startscan + lines - ySrc; - ySrc = 0; - if (cy > lines) cy = lines; - } - if (xSrc >= width) return lines; - if (xSrc + cx >= width) cx = width - xSrc; - if (!cx || !cy) return lines; - - return RosGdiSetDIBitsToDevice(physDev->hKernelDC, pt.x, pt.y, cx, cy, - xSrc, ySrc, startscan, top_down ? -lines : lines, bits, info, coloruse); -} - -void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) -{ - RGNDATA *data; - DWORD size; - - //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); - - /* Update dc region to become a combined region */ - CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - - /* Get region data size */ - if (!(size = GetRegionData( physDev->region, 0, NULL ))) - return; - - /* Allocate memory for it */ - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) - return; - - /* Get region data */ - if (!GetRegionData( physDev->region, size, data )) - { - HeapFree( GetProcessHeap(), 0, data ); - return; - } - - /* Set clipping */ - RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound); - - /* Free memory and delete clipping region */ - HeapFree( GetProcessHeap(), 0, data ); -} - BOOL CDECL RosDrv_SetDeviceGammaRamp(NTDRV_PDEVICE *physDev, LPVOID ramp) { UNIMPLEMENTED; return FALSE; } -COLORREF CDECL RosDrv_SetPixel( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) -{ - POINT ptPixel; - - /* Transform to device coordinates */ - ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); -} - -COLORREF CDECL RosDrv_SetTextColor( NTDRV_PDEVICE *physDev, COLORREF color ) -{ - return RosGdiSetTextColor(physDev->hKernelDC, color); -} - -BOOL CDECL RosDrv_StretchBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ) -{ - BOOL useSrc; - POINT pts[2], ptBrush; - - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hUserDC, pts, 2); - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); -} - BOOL CDECL RosDrv_UnrealizePalette( HPALETTE hpal ) { UNIMPLEMENTED; return FALSE; } -/*********************************************************************** - * DIB_GetBitmapInfoEx - * - * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. - */ -int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, - WORD *compr, DWORD *size ) -{ - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; - return 0; - } - if (header->biSize >= sizeof(BITMAPINFOHEADER)) - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); - return -1; -} - -/*********************************************************************** - * DIB_GetBitmapInfo - * - * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. - */ -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *bpp, WORD *compr ) -{ - WORD planes; - DWORD size; - - return DIB_GetBitmapInfoEx( header, width, height, &planes, bpp, compr, &size); -} - -INT DIB_GetDIBWidthBytes(INT width, INT depth) -{ - return ((width * depth + 31) & ~31) >> 3; -} - /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -15,4 +15,354 @@ /* FUNCTIONS **************************************************************/ +/* get the rectangle in device coordinates, with optional mirroring */ +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + +void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) +{ + RGNDATA *data; + DWORD size; + + //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); + + /* Update dc region to become a combined region */ + CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + + /* Get region data size */ + if (!(size = GetRegionData( physDev->region, 0, NULL ))) + return; + + /* Allocate memory for it */ + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) + return; + + /* Get region data */ + if (!GetRegionData( physDev->region, size, data )) + { + HeapFree( GetProcessHeap(), 0, data ); + return; + } + + /* Set clipping */ + RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound); + + /* Free memory and delete clipping region */ + HeapFree( GetProcessHeap(), 0, data ); +} + + +/*********************************************************************** + * RosDrv_XWStoDS + * + * Performs a world-to-viewport transformation on the specified width. + */ +INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ) +{ + POINT pt[2]; + + pt[0].x = 0; + pt[0].y = 0; + pt[1].x = width; + pt[1].y = 0; + LPtoDP( physDev->hUserDC, pt, 2 ); + return pt[1].x - pt[0].x; +} + +/*********************************************************************** + * RosDrv_YWStoDS + * + * Performs a world-to-viewport transformation on the specified height. + */ +INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ) +{ + POINT pt[2]; + + pt[0].x = 0; + pt[0].y = 0; + pt[1].x = 0; + pt[1].y = height; + LPtoDP( physDev->hUserDC, pt, 2 ); + return pt[1].y - pt[0].y; +} + +BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) +{ + POINT pt[2]; + + /* Get current cursor position */ + GetCurrentPositionEx( physDev->hUserDC, &pt[0] ); + + /* Convert both points coordinates to device */ + pt[1].x = x; + pt[1].y = y; + LPtoDP( physDev->hUserDC, pt, 2 ); + + /* Draw the line */ + return RosGdiLineTo(physDev->hKernelDC, pt[0].x, pt[0].y, pt[1].x, pt[1].y); +} + +BOOL CDECL RosDrv_Arc( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeArc); +} + +BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypePie); +} + +BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, + pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeChord ); +} + +BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) +{ + POINT pts[2]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + + LPtoDP(physDev->hUserDC, pts, 2); + + return RosGdiEllipse(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y); +} + +BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) +{ + POINT ptBrush; + RECT rc = get_device_rect( physDev->hUserDC, left, top, right, bottom ); + + if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; + + if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } + if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + RosGdiRectangle(physDev->hKernelDC, &rc); + + return TRUE; +} + +BOOL CDECL RosDrv_RoundRect( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) +{ + UNIMPLEMENTED; + return FALSE; +} + +COLORREF CDECL RosDrv_SetPixel( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) +{ + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); +} + +COLORREF CDECL RosDrv_GetPixel( NTDRV_PDEVICE *physDev, INT x, INT y ) +{ + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); +} + +BOOL CDECL RosDrv_PaintRgn( NTDRV_PDEVICE *physDev, HRGN hrgn ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_Polyline( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) +{ + register int i; + POINT *points; + + if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * count ))) + { + WARN("No memory to convert POINTs!\n"); + return FALSE; + } + for (i = 0; i < count; i++) + { + POINT tmp = pt[i]; + LPtoDP(physDev->hUserDC, &tmp, 1); + points[i].x = tmp.x; + points[i].y = tmp.y; + } + + /* Call kernel mode */ + RosGdiPolyline(physDev->hKernelDC, points, count); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +BOOL CDECL RosDrv_Polygon( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) +{ + register int i; + POINT *points; + POINT ptBrush; + + if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) + { + WARN("No memory to convert POINTs!\n"); + return FALSE; + } + for (i = 0; i < count; i++) + { + POINT tmp = pt[i]; + LPtoDP(physDev->hUserDC, &tmp, 1); + points[i].x = tmp.x; + points[i].y = tmp.y; + } + points[count] = points[0]; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + /* Call kernel mode */ + RosGdiPolygon(physDev->hKernelDC, points, count+1); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +BOOL CDECL RosDrv_PolyPolygon( NTDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_PolyPolyline( NTDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_ExtFloodFill( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, + UINT fillType ) +{ + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiExtFloodFill(physDev->hKernelDC, ptPixel.x, ptPixel.y, color, fillType); +} + +COLORREF CDECL RosDrv_SetBkColor( NTDRV_PDEVICE *physDev, COLORREF color ) +{ + return RosGdiSetBkColor(physDev->hKernelDC, color); +} + +COLORREF CDECL RosDrv_SetTextColor( NTDRV_PDEVICE *physDev, COLORREF color ) +{ + return RosGdiSetTextColor(physDev->hKernelDC, color); +} + +BOOL CDECL RosDrv_GetICMProfile( NTDRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) +{ + UNIMPLEMENTED; + return FALSE; +} + +INT CDECL RosDrv_EnumICMProfiles( NTDRV_PDEVICE *physDev, ICMENUMPROCW proc, LPARAM lparam ) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -86,16 +86,11 @@ void NTDRV_InitClipboard(void); /* gdidrv.c */ -int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, - WORD *compr, DWORD *size ); +void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ); -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *bpp, WORD *compr ); - -INT DIB_GetDIBWidthBytes(INT width, INT depth); - -void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ); +/* graphics.c */ +INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ); +INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ); /* font.c */ VOID

1 0

[fireball] 50292: - Code cleanup: add source files for common function groups. - Change license information to better reflect the contents. - Move tons of different header includes in individual fi...
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

Author: fireball Date: Wed Jan 5 20:15:19 2011 New Revision: 50292 URL: http://svn.reactos.org/svn/reactos?rev=50292&view=rev Log: - Code cleanup: add source files for common function groups. - Change license information to better reflect the contents. - Move tons of different header includes in individual files to one include set inside winent.h. Added: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c (with props) branches/arwinss/reactos/dll/win32/winent.drv/dib.c (with props) branches/arwinss/reactos/dll/win32/winent.drv/graphics.c (with props) branches/arwinss/reactos/dll/win32/winent.drv/window.c - copied, changed from r50170, branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Removed: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild Added: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS + * LICENSE: GNU LGPL by FSF v2.1 or any later + * FILE: dll/win32/winent.drv/bitblt.c + * PURPOSE: GDI driver stub for ReactOS/Windows + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + + +#include "winent.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bitblt); + +/* FUNCTIONS **************************************************************/ + +/* EOF */ Propchange: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -11,24 +11,7 @@ * 2003 Ulrich Czekalla for CodeWeavers */ -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "wingdi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" #include "winent.h" -#include "wine/unicode.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(clipboard); Added: branches/arwinss/reactos/dll/win32/winent.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/dib.c (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS + * LICENSE: GNU LGPL by FSF v2.1 or any later + * FILE: dll/win32/winent.drv/bitblt.c + * PURPOSE: GDI driver stub for ReactOS/Windows + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include "winent.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bitmap); + +/* FUNCTIONS **************************************************************/ + +/* EOF */ Propchange: branches/arwinss/reactos/dll/win32/winent.drv/dib.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL + * LICENSE: GNU LGPL by FSF v2.1 or any later * FILE: dll/win32/winent.drv/font.c * PURPOSE: Font Engine support functions * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) @@ -8,20 +8,7 @@ /* INCLUDES ***************************************************************/ -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <math.h> -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/list.h" #include "winent.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosgdidrv); Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL + * LICENSE: GNU LGPL by FSF v2.1 or any later * FILE: dll/win32/winent.drv/gdidrv.c * PURPOSE: GDI driver stub for ReactOS/Windows * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) @@ -8,18 +8,7 @@ /* INCLUDES ***************************************************************/ -#include <stdarg.h> -#include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/list.h" #include "winent.h" -#include <pseh/pseh2.h> #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosgdidrv); Added: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/graphics.c (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS + * LICENSE: GNU LGPL by FSF v2.1 or any later + * FILE: dll/win32/winent.drv/graphics.c + * PURPOSE: GDI high-level driver for ReactOS/Windows + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include "winent.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(graphics); + +/* FUNCTIONS **************************************************************/ + +/* EOF */ Propchange: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL + * LICENSE: GNU LGPL by FSF v2.1 or any later * FILE: dll/win32/winent.drv/userdrv.c * PURPOSE: User driver stub for ReactOS/Windows * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) @@ -8,23 +8,7 @@ /* INCLUDES ***************************************************************/ -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "shellapi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" #include "winent.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -19,22 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" #include "winent.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); Modified: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL + * LICENSE: GNU LGPL by FSF v2.1 or any later * FILE: dll/win32/winent.drv/ogldrv.c * PURPOSE: OpenGL driver for ReactOS/Windows * PROGRAMMERS: Kamil Hornicek @@ -8,11 +8,7 @@ /* INCLUDES ***************************************************************/ -#include "windows.h" -#include "wingdi.h" -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" +#include "winent.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosogldrv); Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL + * LICENSE: GNU LGPL by FSF v2.1 or any later * FILE: dll/win32/winent.drv/userdrv.c * PURPOSE: User driver stub for ReactOS/Windows * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) @@ -8,22 +8,7 @@ /* INCLUDES ***************************************************************/ -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" #include "winent.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); Copied: branches/arwinss/reactos/dll/win32/winent.drv/window.c (from r50170, branches/arwinss/reactos/dll/win32/winent.drv/wnd.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,29 +1,14 @@ /* * PROJECT: ReactOS - * LICENSE: LGPL - * FILE: dll/win32/winent.drv/wnd.c + * LICENSE: GNU LGPL by FSF v2.1 or any later + * FILE: dll/win32/winent.drv/window.c * PURPOSE: Windows related functions * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES ***************************************************************/ -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" #include "winent.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -1,3 +1,43 @@ +/* + * WINENT driver definitions + * + * Copyright 2009 Aleksey Bragin + * Some parts taken from Wine project (winex11.drv) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "shellapi.h" +#define NTOS_USER_MODE +#include <ndk/ntndk.h> +#include <winddi.h> +#include <win32k/ntgdityp.h> +#include "ntrosgdi.h" +#include "wine/rosuser.h" +#include "wine/list.h" +#include "wine/unicode.h" +#include "wine/server.h" +#include <pseh/pseh2.h> + /* GDI escapes */ #define NTDRV_ESCAPE 6789 Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Wed Jan 5 20:15:19 2011 @@ -6,13 +6,16 @@ <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="__WINESRC__" /> <define name="_WINE" /> + <file>bitblt.c</file> <file>clipboard.c</file> + <file>dib.c</file> <file>font.c</file> <file>gdidrv.c</file> + <file>graphics.c</file> <file>main.c</file> <file>userdrv.c</file> <file>mouse.c</file> - <file>wnd.c</file> + <file>window.c</file> <file>ogldrv.c</file> <file>winent.rc</file> Removed: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c (removed) @@ -1,288 +1,0 @@ -/* - * PROJECT: ReactOS - * LICENSE: LGPL - * FILE: dll/win32/winent.drv/wnd.c - * PURPOSE: Windows related functions - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <stdarg.h> -#include <stdio.h> -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#define NTOS_USER_MODE -#include <ndk/ntndk.h> -#include <winddi.h> -#include <win32k/ntgdityp.h> -#include "ntrosgdi.h" -#include "wine/rosuser.h" -#include "wine/list.h" -#include "winent.h" -#include "wine/server.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); - -static struct list wnd_data_list = LIST_INIT( wnd_data_list ); -static CRITICAL_SECTION wnd_data_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &wnd_data_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": wnd_data_cs") } -}; -static CRITICAL_SECTION wnd_data_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/* FUNCTIONS **************************************************************/ - -VOID CDECL RosDrv_UpdateZOrder(HWND hwnd, RECT *rect) -{ - FIXME("hwnd %x rect (%d, %d)-(%d,%d)\n", hwnd, - rect->top, rect->left, rect->bottom, rect->right); - - SERVER_START_REQ( update_window_zorder ) - { - req->window = wine_server_user_handle( hwnd ); - req->rect.left = rect->left; - req->rect.top = rect->top; - req->rect.right = rect->right; - req->rect.bottom = rect->bottom; - wine_server_call( req ); - } - SERVER_END_REQ; -} - -struct ntdrv_win_data *associate_create( HWND hwnd ) -{ - struct ntdrv_win_data *data; - - /* Insert our mapping */ - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ntdrv_win_data)); - if(!data) return NULL; - - data->hwnd = hwnd; - - EnterCriticalSection(&wnd_data_cs); - list_add_tail(&wnd_data_list, &data->entry); - LeaveCriticalSection(&wnd_data_cs); - - return data; -} - -VOID associate_destroy( struct ntdrv_win_data *data ) -{ - EnterCriticalSection(&wnd_data_cs); - list_remove( &data->entry ); - LeaveCriticalSection(&wnd_data_cs); - - HeapFree( GetProcessHeap(), 0, data); -} - -struct ntdrv_win_data *associate_find( HWND hwnd ) -{ - struct ntdrv_win_data *item; - BOOL found = FALSE; - - EnterCriticalSection(&wnd_data_cs); - - LIST_FOR_EACH_ENTRY( item, &wnd_data_list, struct ntdrv_win_data, entry ) - if (item->hwnd == hwnd) - { - found = TRUE; - break; - } - - LeaveCriticalSection(&wnd_data_cs); - - if (!found) item = NULL; - - return item; -} - -/*********************************************************************** - * NTDRV_get_win_data - * - * Return the private data structure associated with a window. - */ -struct ntdrv_win_data *NTDRV_get_win_data( HWND hwnd ) -{ - struct ntdrv_win_data *data; - - if (!hwnd) return NULL; - - data = associate_find( hwnd ); - - return data; -} - - -/*********************************************************************** - * NTDRV_create_win_data - * - * Create a private data window structure for an existing window. - */ -struct ntdrv_win_data *NTDRV_create_win_data( HWND hwnd ) -{ - struct ntdrv_win_data *data; - DWORD style, ex_style; - HWND parent; - - if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop */ - - /* don't create win data for HWND_MESSAGE windows */ - if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; - - data = associate_create(hwnd); - if (!data) return NULL; - - GetWindowRect( hwnd, &data->window_rect ); - MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); - data->whole_rect = data->window_rect; - GetClientRect( hwnd, &data->client_rect ); - MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); - - if (parent == GetDesktopWindow()) - { - TRACE( "win %p window %s whole %s client %s\n", - hwnd, wine_dbgstr_rect( &data->window_rect ), - wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); - - style = GetWindowLongW( data->hwnd, GWL_STYLE ); - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - - /* Inform window manager about window rect in screen coords */ - SwmAddWindow(hwnd, &data->window_rect, style, ex_style); - data->whole_window = (PVOID)1; - } - - return data; -} - -/* initialize the desktop window id in the desktop manager process */ -struct ntdrv_win_data *NTDRV_create_desktop_win_data( HWND hwnd ) -{ - struct ntdrv_win_data *data; - - data = associate_create(hwnd); - if (!data) return NULL; - - /* Mark it as being a whole window */ - data->whole_window = (PVOID)1; - - return data; -} - -/*********************************************************************** - * NTDRV_destroy_win_data - * - * Deletes a private data window structure for an existing window. - */ -void NTDRV_destroy_win_data( HWND hwnd ) -{ - struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); - if (!data) return; - - /* Remove property and free its data */ - associate_destroy( data ); - - /* Inform window manager */ - SwmRemoveWindow( hwnd ); -} - -/*********************************************************************** - * map_window - */ -void map_window( struct ntdrv_win_data *data, DWORD new_style ) -{ - TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); - - SwmShowWindow( data->hwnd, TRUE, 0); - - data->mapped = TRUE; - data->iconic = (new_style & WS_MINIMIZE) != 0; -} - - -/*********************************************************************** - * unmap_window - */ -void unmap_window( struct ntdrv_win_data *data ) -{ - TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); - - SwmShowWindow( data->hwnd, FALSE, 0); - - data->mapped = FALSE; - //data->net_wm_state = 0; -} - -/*********************************************************************** - * is_window_rect_mapped - * - * Check if the SWM whole window should be mapped based on its rectangle - */ -BOOL is_window_rect_mapped( const RECT *rect ) -{ - /* don't map if rect is off-screen */ - /*if (rect->left >= virtual_screen_rect.right || - rect->top >= virtual_screen_rect.bottom || - rect->right <= virtual_screen_rect.left || - rect->bottom <= virtual_screen_rect.top) - return FALSE;*/ - - return TRUE; -} - -/*********************************************************************** - * sync_window_position - * - * Synchronize the SWM window position with the Windows one - */ -void sync_window_position( struct ntdrv_win_data *data, - UINT swp_flags, const RECT *old_window_rect, - const RECT *old_whole_rect, const RECT *old_client_rect ) -{ - SwmPosChanged(data->hwnd, &data->whole_rect, old_whole_rect, NULL, swp_flags); - - if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) - { - /* find window that this one must be after */ - HWND prev = GetWindow( data->hwnd, GW_HWNDPREV ); - while (prev && !(GetWindowLongW( prev, GWL_STYLE ) & WS_VISIBLE)) - prev = GetWindow( prev, GW_HWNDPREV ); - if (!prev) /* top child */ - { - /* Bring this window to foreground */ - SwmSetForeground(data->hwnd); - } - /* should use stack_mode Below but most window managers don't get it right */ - /* and Above with a sibling doesn't work so well either, so we ignore it */ - } - -#ifdef HAVE_LIBXSHAPE - if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) - sync_window_region( display, data, (HRGN)1 ); - if (data->shaped) - { - int old_x_offset = old_window_rect->left - old_whole_rect->left; - int old_y_offset = old_window_rect->top - old_whole_rect->top; - int new_x_offset = data->window_rect.left - data->whole_rect.left; - int new_y_offset = data->window_rect.top - data->whole_rect.top; - if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) - XShapeOffsetShape( display, data->whole_window, ShapeBounding, - new_x_offset - old_x_offset, new_y_offset - old_y_offset ); - } -#endif - - TRACE( "win %p/%lx pos %d,%d,%dx%d\n", - data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, - data->whole_rect.right - data->whole_rect.left, - data->whole_rect.bottom - data->whole_rect.top ); -} - -/* EOF */

1 0

[tkreuzer] 50291: [CRT] Fix build
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 22:29:43 2011 New Revision: 50291 URL: http://svn.reactos.org/svn/reactos?rev=50291&view=rev Log: [CRT] Fix build Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Jan 4 22:29:43 2011 @@ -17,7 +17,7 @@ #define streamout wstreamout #define format_float format_floatw #define _flsbuf _flswbuf -int __cdecl _flwsbuf(int ch, FILE *stream); +int __cdecl _flswbuf(int ch, FILE *stream); #endif #define MB_CUR_MAX 10

1 0

[tkreuzer] 50290: [CRT] - Rewrite broken _flsbuf and implement _flswbuf - use _flswbuf in wstreamout - Fixes broken text output in dwnl etc
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 22:22:13 2011 New Revision: 50290 URL: http://svn.reactos.org/svn/reactos?rev=50290&view=rev Log: [CRT] - Rewrite broken _flsbuf and implement _flswbuf - use _flswbuf in wstreamout - Fixes broken text output in dwnl etc Added: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c (with props) trunk/reactos/lib/sdk/crt/stdio/_flswbuf.c (with props) Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Tue Jan 4 22:22:13 2011 @@ -354,6 +354,8 @@ <file>xcptinfo.c</file> </directory> <directory name="stdio"> + <file>_flsbuf.c</file> + <file>_flswbuf.c</file> <file>access.c</file> <file>file.c</file> <file>find.c</file> Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Jan 4 22:22:13 2011 @@ -16,6 +16,8 @@ #ifdef _UNICODE #define streamout wstreamout #define format_float format_floatw +#define _flsbuf _flswbuf +int __cdecl _flwsbuf(int ch, FILE *stream); #endif #define MB_CUR_MAX 10 @@ -68,7 +70,8 @@ va_arg(argptr, double) #ifdef _LIBCNT_ -# define _flsbuf(chr, stream) 0 +# undef _flsbuf +# define _flsbuf(chr, stream) _TEOF #endif #define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) Added: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/_flsbuf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c (added) +++ trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c [iso-8859-1] Tue Jan 4 22:22:13 2011 @@ -1,0 +1,82 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/stdio/_flsbuf.c + * PURPOSE: Implementation of _flsbuf / _flswbuf + * PROGRAMMER: Timo Kreuzer + */ + +#include <stdio.h> +#include <io.h> +#include <tchar.h> + +void __cdecl alloc_buffer(FILE *stream); + +int __cdecl +_flsbuf(int ch, FILE *stream) +{ + int count, written; + + /* Check if the stream supports flushing */ + if ((stream->_flag & _IOSTRG) || !(stream->_flag & (_IORW|_IOWRT))) + { + stream->_flag |= _IOERR; + return EOF; + } + + /* Is this was a read buffer */ + if (stream->_flag & _IOREAD) + { + /* Must be at the end of the file */ + if (!(stream->_flag & _IOEOF)) + { + stream->_flag |= _IOERR; + stream->_cnt = 0; + return EOF; + } + + /* Reset buffer */ + stream->_ptr = stream->_base; + } + + /* Fixup flags */ + stream->_flag &= ~(_IOREAD|_IOEOF); + stream->_flag |= _IOWRT; + + /* If we have no buffer, try to allocate one */ + if (!stream->_base && stream != stdout && stream != stderr) + { + alloc_buffer(stream); + } + + /* Check if we have a buffer now */ + if (stream->_base) + { + /* We have one, check if there is something to write */ + count = stream->_ptr - stream->_base; + if (count > 0) + written = _write(stream->_file, stream->_base, count); + else + written = 0; + + /* Reset buffer and put the char into it */ + stream->_ptr = stream->_base + sizeof(TCHAR); + stream->_cnt = stream->_bufsiz - sizeof(TCHAR); + *(TCHAR*)stream->_base = ch; + } + else + { + /* There is no buffer, write the char directly */ + count = sizeof(TCHAR); + written = _write(stream->_file, &ch, sizeof(TCHAR)); + } + + /* Check for failure */ + if (written != count) + { + stream->_flag |= _IOERR; + return EOF; + } + + return (TCHAR)ch; +} Propchange: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/stdio/_flswbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/_flswbuf… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/_flswbuf.c (added) +++ trunk/reactos/lib/sdk/crt/stdio/_flswbuf.c [iso-8859-1] Tue Jan 4 22:22:13 2011 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/stdio/_flswbuf + * PURPOSE: Implementation of _flswbuf + * PROGRAMMER: Timo Kreuzer + */ + +#define _UNICODE +#define _flsbuf _flswbuf +#include "_flsbuf.c" Propchange: trunk/reactos/lib/sdk/crt/stdio/_flswbuf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Jan 4 22:22:13 2011 @@ -88,7 +88,7 @@ typedef struct { HANDLE handle; unsigned char wxflag; - DWORD unkn[7]; /* critical section and init flag */ + DWORD unkn[7]; /* critical section and init flag */ } ioinfo; ioinfo fdesc[MAX_FILES]; @@ -292,12 +292,12 @@ *handle_ptr = INVALID_HANDLE_VALUE; } wxflag_ptr++; handle_ptr++; - } + } return TRUE; } -/* INTERNAL: Set up all file descriptors, - * as well as default streams (stdin, stderr and stdout) +/* INTERNAL: Set up all file descriptors, + * as well as default streams (stdin, stderr and stdout) */ void msvcrt_init_io(void) { @@ -342,7 +342,7 @@ { #ifndef __REACTOS__ DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), - GetCurrentProcess(), &fdesc[0].handle, 0, TRUE, + GetCurrentProcess(), &fdesc[0].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); #else fdesc[0].handle = GetStdHandle(STD_INPUT_HANDLE); @@ -355,7 +355,7 @@ { #ifndef __REACTOS__ DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), - GetCurrentProcess(), &fdesc[1].handle, 0, TRUE, + GetCurrentProcess(), &fdesc[1].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); #else fdesc[1].handle = GetStdHandle(STD_OUTPUT_HANDLE); @@ -368,7 +368,7 @@ { #ifndef __REACTOS__ DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), - GetCurrentProcess(), &fdesc[2].handle, 0, TRUE, + GetCurrentProcess(), &fdesc[2].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); #else fdesc[2].handle = GetStdHandle(STD_ERROR_HANDLE); @@ -409,7 +409,7 @@ } /* INTERNAL: Allocate stdio file buffer */ -static void alloc_buffer(FILE* file) +void alloc_buffer(FILE* file) { file->_base = calloc(BUFSIZ,1); if(file->_base) { @@ -722,7 +722,7 @@ int CDECL _dup(int od) { int fd, ret; - + LOCK_FILES(); fd = fdstart; if (_dup2(od, fd) == 0) @@ -1393,7 +1393,7 @@ else creation = OPEN_EXISTING; } - + switch( shflags ) { case _SH_DENYRW: @@ -2030,12 +2030,12 @@ wcp = (char *)&wc; for(i=0; i<sizeof(wc); i++) { - if (file->_cnt>0) + if (file->_cnt>0) { file->_cnt--; chp = file->_ptr++; wcp[i] = *chp; - } + } else { j = _filbuf(file); @@ -2050,7 +2050,7 @@ } return wc; } - + c = fgetc(file); if ((*__p___mb_cur_max() > 1) && isleadbyte(c)) { @@ -2287,37 +2287,6 @@ return c & 0xff; } else { return _flsbuf(c, file); - } -} - -/********************************************************************* - * _flsbuf (MSVCRT.@) - */ -int CDECL _flsbuf(int c, FILE* file) -{ - /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & _IONBF)) { - alloc_buffer(file); - } - if(!(file->_flag & _IOWRT)) { - if(file->_flag & _IORW) { - file->_flag |= _IOWRT; - } else { - return EOF; - } - } - if(file->_bufsiz) { - int res=flush_buffer(file); - return res?res : fputc(c, file); - } else { - unsigned char cc=c; - int len; - /* set _cnt to 0 for unbuffered FILEs */ - file->_cnt = 0; - len = _write(file->_file, &cc, 1); - if (len == 1) return c & 0xff; - file->_flag |= _IOERR; - return EOF; } } @@ -2487,7 +2456,7 @@ /* Discard buffered input */ file->_cnt = 0; file->_ptr = file->_base; - + /* Reset direction of i/o */ if(file->_flag & _IORW) { file->_flag &= ~(_IOREAD|_IOWRT); @@ -2560,7 +2529,7 @@ if (!(fdesc[file->_file].wxflag & WX_TEXT)) return fwrite(s,sizeof(*s),len,file) == len ? 0 : EOF; for (i=0; i<len; i++) - if (fputc(s[i], file) == EOF) + if (fputc(s[i], file) == EOF) return EOF; return 0; } @@ -2578,7 +2547,7 @@ if ((s[i] == '\n') && (fputc('\r', file) == EOF)) return WEOF; if (fputwc(s[i], file) == WEOF) - return WEOF; + return WEOF; } return 0; }

1 0

[spetreolle] 50289: TRANSLATION: Fix browseui bulgarian resource filename.
by spetreolle＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: spetreolle Date: Tue Jan 4 22:19:45 2011 New Revision: 50289 URL: http://svn.reactos.org/svn/reactos?rev=50289&view=rev Log: TRANSLATION: Fix browseui bulgarian resource filename. Added: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc (props changed) - copied unchanged from r50288, trunk/reactos/dll/win32/browseui/lang/Bg-bg.rc Removed: trunk/reactos/dll/win32/browseui/lang/Bg-bg.rc Removed: trunk/reactos/dll/win32/browseui/lang/Bg-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/Bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/Bg-bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/Bg-bg.rc (removed) @@ -1,276 +1,0 @@ -/* - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -///////////////////////////////////////////////////////////////////////////// -// -// Menus -// - -IDM_CABINET_CONTEXTMENU MENUEX -BEGIN - POPUP "", 264,MFT_STRING,MFS_ENABLED - BEGIN - MENUITEM "&ÐÐ±Ð¸ÑÐ°Ð¹Ð½Ð¸ Ð±ÑÑÐ¾Ð½Ð¸", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED - MENUITEM "&ÐÐ´ÑÐµÑÐ½Ð° Ð»ÐµÐ½ÑÐ°", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED - MENUITEM "&ÐÑÑÐ·ÐºÐ¸", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR - MENUITEM "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ &Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED - MENUITEM "&ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED - MENUITEM "&Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED - MENUITEM "ÐÑÑÐ¾Ð½ â&ÐÑÐ¸Ð²Ð°Ð½Ðµâ", IDM_TOOLBARS_GOBUTTON,MFT_STRING,MFS_ENABLED - END -END - -IDM_CABINET_MAINMENU MENUEX -BEGIN - POPUP "&Ð¤Ð°Ð¹Ð»", FCIDM_MENU_FILE - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", IDM_FILE_CLOSE - END - POPUP "&ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°", FCIDM_MENU_EDIT - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END - POPUP "ÐÐ·&Ð³Ð»ÐµÐ´", FCIDM_MENU_VIEW - BEGIN - POPUP "ÐÐµÐ½ÑÐ¸ Ñ &Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ", IDM_VIEW_TOOLBARS - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END - MENUITEM "ÐÐµÐ½ÑÐ° Ð½Ð° &ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾", IDM_VIEW_STATUSBAR - POPUP "ÐÐµÐ½ÑÐ° Ð½Ð° &Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ", IDM_VIEW_EXPLORERBAR - BEGIN - MENUITEM "&Ð¢ÑÑÑÐµÐ½Ðµ\tCtrl+E", IDM_EXPLORERBAR_SEARCH - MENUITEM "&ÐÑÐ±Ð¸Ð¼ÐºÐ¸\tCtrl+I", IDM_EXPLORERBAR_FAVORITES - MENUITEM "&ÐÐ¾ÑÐ¸ÑÐµÐ»Ð¸" /* Ð½ÐµÑÑÐ½Ð¾ */, IDM_EXPLORERBAR_MEDIA - MENUITEM "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº\tCtrl+H", IDM_EXPLORERBAR_HISTORY - MENUITEM "&ÐÐ°Ð¿ÐºÐ¸", IDM_EXPLORERBAR_FOLDERS - MENUITEM "", IDM_EXPLORERBAR_SEPARATOR - END - MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR - POPUP "&ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð²", FCIDM_MENU_EXPLORE - BEGIN - MENUITEM "ÐÐ°&Ð·Ð°Ð´\tAlt+Left Arrow", IDM_GOTO_BACK - MENUITEM "ÐÐ°&Ð¿ÑÐµÐ´\tAlt+Right Arrow", IDM_GOTO_FORWARD - MENUITEM "Ð Ð°Ð²Ð½Ð¸ÑÐµ Ð½Ð°Ð³Ð¾ÑÐµ", IDM_GOTO_UPONELEVEL - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ°ÑÐ°Ð»Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°\tAlt+Home", IDM_GOTO_HOMEPAGE - END - MENUITEM "Ð&Ð¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_REFRESH - END - POPUP "&ÐÑÐ±Ð¸Ð¼ÐºÐ¸", FCIDM_MENU_FAVORITES - BEGIN - MENUITEM "ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ ÐºÑÐ¼ &Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ...", IDM_FAVORITES_ADDTOFAVORITES - MENUITEM "&ÐÐ¾Ð´ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ", IDM_FAVORITES_ORGANIZEFAVORITES - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "(ÐÑÐ°Ð·Ð½Ð¾)", IDM_FAVORITES_EMPTY - END - POPUP "&ÐÐ¾ÑÐ¾Ð±Ð¸Ñ", FCIDM_MENU_TOOLS - BEGIN - MENUITEM "ÐÐ°Ð·Ð½Ð°ÑÐ°Ð²Ð°Ð½Ðµ Ð½Ð° &Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾", IDM_TOOLS_MAPNETWORKDRIVE - MENUITEM "&Ð Ð°Ð·ÐºÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾", IDM_TOOLS_DISCONNECTNETWORKDRIVE - MENUITEM "&Ð¡ÑÐ³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ", IDM_TOOLS_SYNCHRONIZE - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ", IDM_TOOLS_FOLDEROPTIONS - END - POPUP "ÐÐ¾Ð¼Ð¾&Ñ", FCIDM_MENU_HELP - BEGIN - MENUITEM "ÐÐ°ÐºÐ¾Ð½ÐµÐ½ Ð»Ð¸ Ðµ ÑÐ¾Ð·Ð¸ Ð±ÑÐ¾Ð¹ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡?", IDM_HELP_ISTHISCOPYLEGAL - MENUITEM "&ÐÐ° Ð ÐµÐ°ÐºÑÐÐ¡", IDM_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialogs -// - -IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 36 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° &ÑÐµÐºÑÑÐ°:",-1,4,2,48,15 - COMBOBOX IDC_TEXTOPTIONS,52,0,123,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° &Ð·Ð½Ð°ÑÐµÑÐ°ÑÐ°:",-1,4,20,48,15 - COMBOBOX IDC_ICONOPTIONS,52,18,123,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATORS ACCELERATORS -BEGIN - VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT - "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT - VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT - "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT - "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT - VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT - VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT - "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT - "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT - "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT - "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Strings -// - -STRINGTABLE -BEGIN - 800 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ´Ð¼ÐµÑÐ¸." -END - -STRINGTABLE -BEGIN - 864 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°." -END - -STRINGTABLE -BEGIN - 928 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð°." -END - -STRINGTABLE -BEGIN - 992 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÑÐ¾Ð±Ð¸ÑÑÐ°." -END - -STRINGTABLE -BEGIN - 1056 "Ð¡ÑÑÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ." -END - -STRINGTABLE -BEGIN - 9025 "ÐÐ°ÑÐ²Ð°ÑÑ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." - 9026 "ÐÑÐ¸Ð²Ð° ÑÐ°Ð²Ð½Ð¸ÑÐµ Ð½Ð°Ð³Ð¾ÑÐµ." -END - -STRINGTABLE -BEGIN - 9121 "Ð¡Ð²ÑÑÐ²Ð°Ð½Ðµ ÐºÑÐ¼ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." - 9122 "Ð Ð°Ð·ÐºÐ°ÑÐ°Ð½Ðµ Ð¾Ñ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." -END - -STRINGTABLE -BEGIN - 9250 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°ÑÐ°, Ð²ÐµÑÑÐ¸Ñ Ð¸ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¸ Ð¿ÑÐ°Ð²Ð°." - 9252 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð½ÐµÐ´ÑÐ·Ð¸." -END - -STRINGTABLE -BEGIN - 9281 "ÐÑÐ¸Ð²Ð° Ð½Ð° Ð¿ÑÐµÐ´ÑÐ¾Ð´Ð½Ð°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." - 9282 "ÐÑÐ¸Ð²Ð° Ð½Ð° ÑÐ»ÐµÐ´Ð²Ð°ÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." - 9283 "ÐÐ¾Ð·Ð²Ð¾Ð»Ñ Ð²Ð¸ Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ." - 9285 "ÐÑÐ¸Ð²Ð° Ð² Ð½Ð°ÑÐ°Ð»Ð½Ð°ÑÐ° Ð²Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ°." -END - -STRINGTABLE -BEGIN - 9362 "ÐÑÐ²Ð°ÑÑ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." - 9363 "ÐÐ¾Ð±Ð°Ð²Ñ ÑÐµÐºÑÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° ÐºÑÐ¼ ÑÐ¿Ð¸ÑÑÐºÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." -END - -STRINGTABLE -BEGIN - 9505 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." - 9506 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾." - 9508 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸ÑÐµ Ð±ÑÑÐ¾Ð½Ð¸." /* Ð½ÐµÑÑÐ½Ð¾ */ - 9509 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° Ð°Ð´ÑÐµÑÐ½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°." - 9510 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½Ð°ÑÐ° Ñ Ð±ÑÑÐ·Ð¸ÑÐµ Ð²ÑÑÐ·ÐºÐ¸." - 9516 "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð·Ð¼ÐµÑÐ¸ÑÐµ Ð¸ ÑÐ°Ð·Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." -END - -STRINGTABLE -BEGIN - 9533 "ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." -END - -STRINGTABLE -BEGIN - 9552 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð¸Ð»Ð¸ ÑÐºÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ." - 9553 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð·Ð° ÑÑÑÑÐµÐ½Ðµ." - 9554 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." - 9555 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ°." - 9557 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð¿Ð°Ð¿ÐºÐ¸ÑÐµ." - 9559 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°." -END - -STRINGTABLE -BEGIN - IDS_SMALLICONS "ÐÐ°Ð»ÐºÐ¸ Ð·Ð½Ð°ÑÐµÑÐ°" - IDS_LARGEICONS "ÐÐ¾Ð»ÐµÐ¼Ð¸ Ð·Ð½Ð°ÑÐµÑÐ°" - IDS_SHOWTEXTLABELS "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" -END - -STRINGTABLE -BEGIN - IDS_NOTEXTLABELS "ÐÐ¸Ð¿ÑÐ²Ð°Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" - IDS_SELECTIVETEXTONRIGHT "Selective text on right" -END - -STRINGTABLE -BEGIN - IDS_GOBUTTONLABEL "|ÐÑÐ¸Ð²Ð°Ð½Ðµ||" - IDS_GOBUTTONTIPTEMPLATE "ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð²""%s""" -END - -STRINGTABLE -BEGIN - IDS_SEARCHLABEL "Ð¢ÑÑÑÐµÐ½Ðµ" - IDS_ADDRESSBANDLABEL "&ÐÐ´ÑÐµÑ" -END - -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" -END - -STRINGTABLE -BEGIN - IDS_HISTORYTEXT "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº\tCtrl+H" -END - -STRINGTABLE -BEGIN - IDS_UP "ÐÐ°Ð³Ð¾ÑÐµ" -END - -STRINGTABLE -BEGIN - IDS_BACK "ÐÐ°Ð·Ð°Ð´" - IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" -END - - Propchange: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jan 4 22:19:45 2011 @@ -1,0 +1,5 @@ +/branches/header-work/dll/win32/browseui/lang/Bg-bg.rc:45691-47721 +/branches/reactos-yarotows/dll/win32/browseui/lang/Bg-bg.rc:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/dll/win32/browseui/lang/Bg-bg.rc:49994-49995 +/branches/ros-amd64-bringup/dll/win32/browseui/lang/Bg-bg.rc:36852 +/branches/ros-amd64-bringup/reactos/dll/win32/browseui/lang/Bg-bg.rc:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882

1 0

[tkreuzer] 50288: [WIN32K] - Fix type of DCLEVEL::prgnClip / prgnMeta (PVOID -> PREGION) - Move NtGdiGetRandomRgn to dcobjs.c
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 18:18:28 2011 New Revision: 50288 URL: http://svn.reactos.org/svn/reactos?rev=50288&view=rev Log: [WIN32K] - Fix type of DCLEVEL::prgnClip / prgnMeta (PVOID -> PREGION) - Move NtGdiGetRandomRgn to dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.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] Tue Jan 4 18:18:28 2011 @@ -76,8 +76,8 @@ HGDIOBJ hPath; /* HPATH */ FLONG flPath; LINEATTRS laPath; /* 0x20 bytes */ - PVOID prgnClip; /* PROSRGNDATA */ - PVOID prgnMeta; + PREGION prgnClip; + PREGION prgnMeta; COLORADJUSTMENT ca; FLONG flFontState; UNIVERSAL_FONT_ID ufi; @@ -126,9 +126,9 @@ RECTL erclWindow; RECTL erclBounds; RECTL erclBoundsApp; - PROSRGNDATA prgnAPI; /* PROSRGNDATA */ - PROSRGNDATA prgnVis; /* Visible region (must never be 0) */ - PROSRGNDATA prgnRao; + PREGION prgnAPI; + PREGION prgnVis; /* Visible region (must never be 0) */ + PREGION prgnRao; POINTL ptlFillOrigin; EBRUSHOBJ eboFill; EBRUSHOBJ eboLine; Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Tue Jan 4 18:18:28 2011 @@ -483,13 +483,13 @@ RGN_AND); if ( Ret ) { - GDIOBJ_ShareUnlockObjByPtr(pDC->dclevel.prgnMeta); + GDIOBJ_ShareUnlockObjByPtr(&pDC->dclevel.prgnMeta->BaseObject); if (!((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.ulShareCount) REGION_Delete(pDC->dclevel.prgnMeta); pDC->dclevel.prgnMeta = TempRgn; - GDIOBJ_ShareUnlockObjByPtr(pDC->dclevel.prgnClip); + GDIOBJ_ShareUnlockObjByPtr(&pDC->dclevel.prgnClip->BaseObject); if (!((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.ulShareCount) REGION_Delete(pDC->dclevel.prgnClip); 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] Tue Jan 4 18:18:28 2011 @@ -457,6 +457,79 @@ return SelObject; } +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw + + 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! + + The intersection of the clip with the meta region is not Rao it's API! + Go back and read 7.2 Clipping pages 418-19: + Rao = API & Vis: + 1) The Rao region is the intersection of the API region and the system region, + named after the Microsoft engineer who initially proposed it. + 2) The Rao region can be calculated from the API region and the system region. + + API: + API region is the intersection of the meta region and the clipping region, + clearly named after the fact that it is controlled by GDI API calls. +*/ +INT +APIENTRY +NtGdiGetRandomRgn( + HDC hdc, + HRGN hrgnDest, + INT iCode) +{ + INT ret = 0; + PDC pdc; + HRGN hrgnSrc = NULL; + POINTL ptlOrg; + + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return -1; + } + + switch (iCode) + { + case CLIPRGN: + hrgnSrc = pdc->rosdc.hClipRgn; +// if (pdc->dclevel.prgnClip) hrgnSrc = pdc->dclevel.prgnClip->BaseObject.hHmgr; + break; + case METARGN: + if (pdc->dclevel.prgnMeta) + hrgnSrc = pdc->dclevel.prgnMeta->BaseObject.hHmgr; + break; + case APIRGN: + if (pdc->prgnAPI) hrgnSrc = pdc->prgnAPI->BaseObject.hHmgr; +// else if (pdc->dclevel.prgnClip) hrgnSrc = pdc->dclevel.prgnClip->BaseObject.hHmgr; + else if (pdc->rosdc.hClipRgn) hrgnSrc = pdc->rosdc.hClipRgn; + else if (pdc->dclevel.prgnMeta) hrgnSrc = pdc->dclevel.prgnMeta->BaseObject.hHmgr; + break; + case SYSRGN: + if (pdc->prgnVis) hrgnSrc = pdc->prgnVis->BaseObject.hHmgr; + break; + default: + hrgnSrc = NULL; + } + + if (hrgnSrc) + { + ret = NtGdiCombineRgn(hrgnDest, hrgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1; + } + + if (iCode == SYSRGN) + { + ptlOrg = pdc->ptlDCOrig; + NtGdiOffsetRgn(hrgnDest, ptlOrg.x, ptlOrg.y ); + } + + DC_UnlockDc(pdc); + + return ret; +} + ULONG APIENTRY NtGdiEnumObjects( 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] Tue Jan 4 18:18:28 2011 @@ -3637,83 +3637,6 @@ } -/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw - - 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! - - The intersection of the clip with the meta region is not Rao it's API! - Go back and read 7.2 Clipping pages 418-19: - Rao = API & Vis: - 1) The Rao region is the intersection of the API region and the system region, - named after the Microsoft engineer who initially proposed it. - 2) The Rao region can be calculated from the API region and the system region. - - API: - API region is the intersection of the meta region and the clipping region, - clearly named after the fact that it is controlled by GDI API calls. -*/ -INT APIENTRY -NtGdiGetRandomRgn( - HDC hDC, - HRGN hDest, - INT iCode -) -{ - INT ret = 0; - PDC pDC; - HRGN hSrc = NULL; - POINT org; - - pDC = DC_LockDc(hDC); - if (pDC == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return -1; - } - - switch (iCode) - { - case CLIPRGN: - hSrc = pDC->rosdc.hClipRgn; -// if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; - break; - case METARGN: - if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case APIRGN: - if (pDC->prgnAPI) hSrc = ((PROSRGNDATA)pDC->prgnAPI)->BaseObject.hHmgr; -// else if (pDC->dclevel.prgnClip) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnClip)->BaseObject.hHmgr; - else if (pDC->rosdc.hClipRgn) hSrc = pDC->rosdc.hClipRgn; - else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr; - break; - case SYSRGN: - if (pDC->prgnVis) hSrc = pDC->prgnVis->BaseObject.hHmgr; - break; - default: - hSrc = 0; - } - if (hSrc) - { - if (NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) - { - ret = -1; - } - else - { - ret = 1; - } - } - if (iCode == SYSRGN) - { - org = pDC->ptlDCOrig; - NtGdiOffsetRgn(hDest, org.x, org.y ); - } - - DC_UnlockDc(pDC); - - return ret; -} - INT APIENTRY NtGdiGetRgnBox( HRGN hRgn,

1 0

[janderwald] 50287: [CRT] - Fix build
by janderwald＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: janderwald Date: Tue Jan 4 17:52:34 2011 New Revision: 50287 URL: http://svn.reactos.org/svn/reactos?rev=50287&view=rev Log: [CRT] - Fix build Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] Tue Jan 4 17:52:34 2011 @@ -54,7 +54,9 @@ if (any < 0) { acc = ULLONG_MAX; +#ifndef _LIBCNT_ __set_errno(ERANGE); +#endif } else if (neg) acc = -acc;

1 0

[janderwald] 50286: [CRT] - Set errno when a overflow occurs in strtoull - Fixes 2 wine tests failures in msvcrt:string
by janderwald＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: janderwald Date: Tue Jan 4 17:29:10 2011 New Revision: 50286 URL: http://svn.reactos.org/svn/reactos?rev=50286&view=rev Log: [CRT] - Set errno when a overflow occurs in strtoull - Fixes 2 wine tests failures in msvcrt:string Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoull.c [iso-8859-1] Tue Jan 4 17:29:10 2011 @@ -54,6 +54,7 @@ if (any < 0) { acc = ULLONG_MAX; + __set_errno(ERANGE); } else if (neg) acc = -acc;

1 0

[janderwald] 50285: [MSVCRT_WINETEST] - Revert 50283
by janderwald＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: janderwald Date: Tue Jan 4 17:27:57 2011 New Revision: 50285 URL: http://svn.reactos.org/svn/reactos?rev=50285&view=rev Log: [MSVCRT_WINETEST] - Revert 50283 Modified: trunk/rostests/winetests/msvcrt/cpp.c Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Tue Jan 4 17:27:57 2011 @@ -844,7 +844,7 @@ { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, -/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE},*/ /*FAILS in WINXP SP3 */ + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, /* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ }; int i, num_test = (sizeof(demangle)/sizeof(struct _demangle));

1 0

← Newer
1
...
27
28
29
30
31
32
33
34
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011