Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[jgardou] 47702: [GDI32] - Header describes the bitmap to be created, not the bits we are passed. - Circumvent gcc weirdness (sigh...)

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jun 9 02:18:29 2010 New Revision: 47702 URL: http://svn.reactos.org/svn/reactos?rev=47702&view=rev Log: [GDI32] - Header describes the bitmap to be created, not the bits we are passed. - Circumvent gcc weirdness (sigh...) Modified: branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c Modified: branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed Jun 9 02:18:29 2010 @@ -146,7 +146,7 @@ typedef BOOL (WINAPI *SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL); typedef BOOL (WINAPI *SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD); // Same as ddk/winsplp.h DriverUnloadComplete? -typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR); +typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR); // Driver support: // DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW typedef INT (WINAPI *DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID); @@ -173,10 +173,10 @@ VOID HEAP_free(LPVOID memory); -VOID +VOID FASTCALL FONT_TextMetricWToA( - const TEXTMETRICW *ptmW, + const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA ); @@ -279,7 +279,7 @@ GdiSetLastError( DWORD dwErrCode ); DWORD WINAPI GdiGetCodePage(HDC); -UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO ); +UINT FASTCALL DIB_BitmapBitsSize( CONST BITMAPINFO* ); int WINAPI Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Jun 9 02:18:29 2010 @@ -34,7 +34,7 @@ UINT FASTCALL -DIB_BitmapBitsSize( PBITMAPINFO Info ) +DIB_BitmapBitsSize( CONST BITMAPINFO* Info ) { UINT Ret; @@ -476,7 +476,8 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header); + /* Mmmh, this is not really safe */ + cjBmpScanSize = DIB_BitmapBitsSize(Data); DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); if ( !width || !height )

14 years, 6 months

[jgardou] 47701: [WIN32K] - More BITMAPV5INFO fun - Probe max size we are asked for when converting to V5 Info [USER32] [WIN32K] - CreateDIBitmap : Move safety handling to win32k, where it belongs. More code cleanness!

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jun 9 02:08:50 2010 New Revision: 47701 URL: http://svn.reactos.org/svn/reactos?rev=47701&view=rev Log: [WIN32K] - More BITMAPV5INFO fun - Probe max size we are asked for when converting to V5 Info [USER32] [WIN32K] - CreateDIBitmap : Move safety handling to win32k, where it belongs. More code cleanness! Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -43,16 +43,16 @@ if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; - Ret = Core->bcHeight * + Ret = Core->bcHeight * ((Core->bcWidth * Core->bcPlanes * Core->bcBitCount + 31) & ~31 ) / 8; } else /* assume BITMAPINFOHEADER */ { - if ((Info->bmiHeader.biCompression) && + if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) return Info->bmiHeader.biSizeImage; // Make Height positive always.... - Ret = abs(Info->bmiHeader.biHeight) * + Ret = abs(Info->bmiHeader.biHeight) * ((Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes * Info->bmiHeader.biBitCount + 31) & ~31 ) / 8; } return Ret; @@ -132,12 +132,12 @@ GdiGetBitmapBitsSize(BITMAPINFO *lpbmi) { int retSize; - + if (lpbmi->bmiHeader.biSize == FIELD_OFFSET(BITMAPINFOHEADER, biPlanes)) { /* Calc the bits Size and align it*/ - retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * - LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31) + retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * + LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31) & -32) / 8; } else @@ -148,13 +148,13 @@ if (lpbmi->bmiHeader.biHeight >=0 ) { /* Calc the bits Size and align it*/ - retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth * + retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; } else { /* Make height postiive if it negitve then calc the bits Size and align it*/ - retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth * + retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8; } } @@ -189,7 +189,7 @@ { // Verify header due to converted may == info. if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG ) { SetLastError(ERROR_INVALID_PARAMETER); @@ -319,7 +319,7 @@ (!(pbm->bmWidthBytes & 1)) ) { - + bitmap = CreateBitmap(pbm->bmWidth, pbm->bmHeight, pbm->bmPlanes, @@ -409,7 +409,7 @@ { if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || lpbmi->bmiHeader.biCompression == BI_PNG ) { SetLastError(ERROR_INVALID_PARAMETER); @@ -461,16 +461,11 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - PBITMAPINFO pConvertedInfo; UINT ConvertedInfoSize; UINT cjBmpScanSize; - PVOID pvSafeBits = NULL; HBITMAP hBmp; if (!Header) return 0; - - pConvertedInfo = ConvertBitmapInfo(Data, ColorUse, - &ConvertedInfoSize, FALSE); if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { @@ -478,61 +473,28 @@ return NULL; } - if ( pConvertedInfo ) - { - if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || - pConvertedInfo->bmiHeader.biCompression == BI_PNG ) - { - hBmp = NULL; - goto Exit; - } - } - } - // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)pConvertedInfo); - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", pConvertedInfo,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); + cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header); + DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); else { - if ( Bits && Init == CBM_INIT ) - { - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits == NULL) - { - hBmp = NULL; - goto Exit; - } - else - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - } - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, - (LPBYTE)pvSafeBits, - (PBITMAPINFO)pConvertedInfo, + (LPBYTE)Bits, + (LPBITMAPINFO)Data, ColorUse, ConvertedInfoSize, cjBmpScanSize, 0, 0); - - if ( Bits && Init == CBM_INIT ) - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - } -Exit: - if (Data != pConvertedInfo) - RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + } return hBmp; } @@ -588,7 +550,7 @@ if ( hOldBitmap ) { - if ( hDC ) + if ( hDC ) hPal = SelectPalette(SavehDC, (HPALETTE)GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE), FALSE); if ( lpbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) @@ -782,7 +744,7 @@ /* if ( !pDc_Attr || ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { LinesCopied = NtGdiSetDIBitsToDeviceInternal( hdc, @@ -806,7 +768,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpbmi != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); - + return LinesCopied; } @@ -933,7 +895,7 @@ /* if ( !pDc_Attr || ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ { LinesCopied = NtGdiStretchDIBitsInternal( hdc, Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -13,7 +13,7 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); -NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse); +NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse, UINT MaxSize); VOID FASTCALL GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, OUT PBITMAPINFO pbmiDst, IN DWORD dwUse); HBITMAP Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -199,7 +199,8 @@ { Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, - DIB_RGB_COLORS); + DIB_RGB_COLORS, + 0); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jun 9 02:08:50 2010 @@ -354,7 +354,8 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, 0); + /* Don't check Bits and hope we won't die */ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -427,7 +428,8 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, cjMaxInfo); + ProbeForRead(Bits, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -595,7 +597,7 @@ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage, MaxInfo); if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -842,7 +844,7 @@ bmiLocal.bmiHeader.bV5BitCount) * DestSize.cy; hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, + DIB_GetDIBWidthBytes(DestSize.cx, bmiLocal.bmiHeader.bV5BitCount), BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, bmiLocal.bmiHeader.bV5Compression), @@ -942,7 +944,8 @@ HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; - BOOL Hit = FALSE; + NTSTATUS Status; + BITMAPV5INFO bmiLocal ; if (!Bits || !BitsInfo) { @@ -952,16 +955,16 @@ _SEH2_TRY { - ProbeForRead(BitsInfo, cjMaxInfo, 1); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, BitsInfo, Usage, cjMaxInfo); ProbeForRead(Bits, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + Status = _SEH2_GetExceptionCode(); } _SEH2_END - if (Hit) + if (!NT_SUCCESS(Status)) { DPRINT1("NtGdiStretchDIBitsInternal fail to read BitMapInfo: %x or Bits: %x\n",BitsInfo,Bits); return 0; @@ -975,8 +978,8 @@ } hBitmap = NtGdiCreateCompatibleBitmap(hDC, - abs(BitsInfo->bmiHeader.biWidth), - abs(BitsInfo->bmiHeader.biHeight)); + abs(bmiLocal.bmiHeader.bV5Width), + abs(bmiLocal.bmiHeader.bV5Height)); if (hBitmap == NULL) { DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n"); @@ -995,15 +998,15 @@ hPal = GdiSelectPalette(hdcMem, hPal, FALSE); } - if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || - BitsInfo->bmiHeader.biCompression == BI_RLE8) + if (bmiLocal.bmiHeader.bV5Compression == BI_RLE4 || + bmiLocal.bmiHeader.bV5Compression == BI_RLE8) { /* copy existing bitmap from destination dc */ if (SrcWidth == DestWidth && SrcHeight == DestHeight) - NtGdiBitBlt(hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + NtGdiBitBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, hDC, XDest, YDest, ROP, 0, 0); else - NtGdiStretchBlt(hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + NtGdiStretchBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, hDC, XDest, YDest, DestWidth, DestHeight, ROP, 0); } @@ -1015,8 +1018,8 @@ * if it negitve we getting to many scanline for scanline is UINT not * a INT, so we need make the negtive value to positve and that make the * count correct for negtive bitmap, TODO : we need testcase for this api */ - IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, - BitsInfo, Usage); + IntSetDIBits(pDC, hBitmap, 0, abs(bmiLocal.bmiHeader.bV5Height), Bits, + (PBITMAPINFO)&bmiLocal, Usage); DC_UnlockDc(pDC); } @@ -1026,11 +1029,11 @@ left (negative biHeight) */ if (SrcWidth == DestWidth && SrcHeight == DestHeight) NtGdiBitBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, ROP, 0, 0); else NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, + hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0); /* cleanup */ @@ -1057,7 +1060,7 @@ UINT bpp, DWORD init, LPBYTE bits, - PBITMAPINFO data, + PBITMAPV5INFO data, DWORD coloruse) { HBITMAP handle; @@ -1070,40 +1073,19 @@ else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; else { - if (data->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - const RGBQUAD *rgb = data->bmiColors; - DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); - - // Check if the first color of the colormap is black - if ((col == RGB(0, 0, 0))) - { - rgb++; - col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); - - // If the second color is white, create a monochrome bitmap - fColor = (col != RGB(0xff,0xff,0xff)); - } - else fColor = TRUE; - } - else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors; - DWORD col = RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); - - if ((col == RGB(0,0,0))) - { - rgb++; - col = RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); - fColor = (col != RGB(0xff,0xff,0xff)); - } - else fColor = TRUE; - } - else - { - DPRINT("(%ld): wrong size for data\n", data->bmiHeader.biSize); - return 0; - } + const RGBQUAD *rgb = data->bmiColors; + DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); + + // Check if the first color of the colormap is black + if ((col == RGB(0, 0, 0))) + { + rgb++; + col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); + + // If the second color is white, create a monochrome bitmap + fColor = (col != RGB(0xff,0xff,0xff)); + } + else fColor = TRUE; } // Now create the bitmap @@ -1125,7 +1107,7 @@ if (NULL != handle && CBM_INIT == init) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, (BITMAPINFO*)data, coloruse); } return handle; @@ -1151,6 +1133,25 @@ PDC Dc; HBITMAP Bmp; UINT bpp; + BITMAPV5INFO bmiLocal ; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + if(pbmi) Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, iUsage, cjMaxInitInfo); + if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } if (!hDc) // CreateBitmap { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. @@ -1169,7 +1170,7 @@ return NULL; } bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); @@ -1187,7 +1188,7 @@ should match that of the hdc and not that supplied in bmih. */ if (pbmi) - bpp = pbmi->bmiHeader.biBitCount; + bpp = bmiLocal.bmiHeader.bV5BitCount; else { if (Dc->dctype != DC_TYPE_MEMORY) @@ -1211,7 +1212,7 @@ } } } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); DC_UnlockDc(Dc); } return Bmp; @@ -1760,7 +1761,8 @@ ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, - IN DWORD dwColorUse) + IN DWORD dwColorUse, + IN UINT MaxSize) { DWORD dwSize; ULONG ulWidthBytes; @@ -1769,7 +1771,8 @@ /* Get the size and probe */ ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1); dwSize = pbmiUnsafe->bmiHeader.biSize; - ProbeForRead(pbmiUnsafe, dwSize, 1); + /* At least dwSize bytes must be valids */ + ProbeForRead(pbmiUnsafe, max(dwSize, MaxSize), 1); /* Check the size */ // FIXME: are intermediate sizes allowed? As what are they interpreted?

14 years, 6 months

[tkreuzer] 47700: Sync trunk (r47699)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jun 9 00:20:26 2010 New Revision: 47700 URL: http://svn.reactos.org/svn/reactos?rev=47700&view=rev Log: Sync trunk (r47699) Modified: branches/header-work/ (props changed) branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c branches/header-work/include/ndk/rtlfuncs.h branches/header-work/lib/rtl/network.c Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 9 00:20:26 2010 @@ -1,4 +1,4 @@ /branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,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,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,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,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-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,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 -/trunk/reactos:45691-47697 +/trunk/reactos:45691-47699 Modified: branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/ws2_32_ne… ============================================================================== --- branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ branches/header-work/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -91,7 +91,7 @@ LPWSTR Ip = 0; /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address); + RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); /* Return the address and success */ *pAddress = Address; Modified: branches/header-work/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtlfunc… ============================================================================== --- branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/ndk/rtlfuncs.h [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -3185,9 +3185,9 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, + IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr ); Modified: branches/header-work/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/rtl/network.c?r… ============================================================================== --- branches/header-work/lib/rtl/network.c [iso-8859-1] (original) +++ branches/header-work/lib/rtl/network.c [iso-8859-1] Wed Jun 9 00:20:26 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

14 years, 6 months

[spetreolle] 47699: Merge RtlIpv4StringToAddressW fix from network branch.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Jun 8 22:24:15 2010 New Revision: 47699 URL: http://svn.reactos.org/svn/reactos?rev=47699&view=rev Log: Merge RtlIpv4StringToAddressW fix from network branch. Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -91,7 +91,7 @@ LPWSTR Ip = 0; /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address); + RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); /* Return the address and success */ *pAddress = Address; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -3185,9 +3185,9 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, + IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr ); Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=4769… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Tue Jun 8 22:24:15 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

14 years, 6 months

[akhaldi] 47698: Sync trunk head (r47697).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jun 8 22:04:37 2010 New Revision: 47698 URL: http://svn.reactos.org/svn/reactos?rev=47698&view=rev Log: Sync trunk head (r47697). Modified: branches/header-work/ (props changed) branches/header-work/dll/win32/comctl32/animate.c branches/header-work/dll/win32/comctl32/comboex.c branches/header-work/dll/win32/comctl32/comctl32.h branches/header-work/dll/win32/comctl32/comctl32.rbuild branches/header-work/dll/win32/comctl32/comctl32undoc.c branches/header-work/dll/win32/comctl32/comctl_Bg.rc branches/header-work/dll/win32/comctl32/comctl_Cs.rc branches/header-work/dll/win32/comctl32/comctl_De.rc branches/header-work/dll/win32/comctl32/comctl_El.rc branches/header-work/dll/win32/comctl32/comctl_En.rc branches/header-work/dll/win32/comctl32/comctl_Eo.rc branches/header-work/dll/win32/comctl32/comctl_Es.rc branches/header-work/dll/win32/comctl32/comctl_Fr.rc branches/header-work/dll/win32/comctl32/comctl_Hu.rc branches/header-work/dll/win32/comctl32/comctl_It.rc branches/header-work/dll/win32/comctl32/comctl_Ja.rc branches/header-work/dll/win32/comctl32/comctl_Ko.rc branches/header-work/dll/win32/comctl32/comctl_Lt.rc branches/header-work/dll/win32/comctl32/comctl_Nl.rc branches/header-work/dll/win32/comctl32/comctl_No.rc branches/header-work/dll/win32/comctl32/comctl_Pl.rc branches/header-work/dll/win32/comctl32/comctl_Pt.rc branches/header-work/dll/win32/comctl32/comctl_Ro.rc branches/header-work/dll/win32/comctl32/comctl_Ru.rc branches/header-work/dll/win32/comctl32/comctl_Si.rc branches/header-work/dll/win32/comctl32/comctl_Sk.rc branches/header-work/dll/win32/comctl32/comctl_Sv.rc branches/header-work/dll/win32/comctl32/comctl_Th.rc branches/header-work/dll/win32/comctl32/comctl_Tr.rc branches/header-work/dll/win32/comctl32/comctl_Uk.rc branches/header-work/dll/win32/comctl32/comctl_Zh.rc branches/header-work/dll/win32/comctl32/commctrl.c branches/header-work/dll/win32/comctl32/datetime.c branches/header-work/dll/win32/comctl32/dpa.c branches/header-work/dll/win32/comctl32/draglist.c branches/header-work/dll/win32/comctl32/header.c branches/header-work/dll/win32/comctl32/idb_hist_large.bmp branches/header-work/dll/win32/comctl32/idb_hist_small.bmp branches/header-work/dll/win32/comctl32/idb_std_large.bmp branches/header-work/dll/win32/comctl32/idb_std_small.bmp branches/header-work/dll/win32/comctl32/idb_view_large.bmp branches/header-work/dll/win32/comctl32/idb_view_small.bmp branches/header-work/dll/win32/comctl32/imagelist.c branches/header-work/dll/win32/comctl32/imagelist.h branches/header-work/dll/win32/comctl32/ipaddress.c branches/header-work/dll/win32/comctl32/listview.c branches/header-work/dll/win32/comctl32/monthcal.c branches/header-work/dll/win32/comctl32/rsrc.rc branches/header-work/dll/win32/kernel32/misc/console.c branches/header-work/drivers/wdm/audio/legacy/wdmaud/control.c branches/header-work/hal/halx86/generic/legacy/bus/bushndlr.c branches/header-work/hal/halx86/generic/legacy/bus/isabus.c branches/header-work/hal/halx86/generic/legacy/bus/pcibus.c branches/header-work/hal/halx86/generic/legacy/bus/sysbus.c branches/header-work/hal/halx86/generic/legacy/bussupp.c branches/header-work/hal/halx86/include/bus.h branches/header-work/hal/halx86/include/halp.h branches/header-work/hal/halx86/mp/processor_mp.c branches/header-work/include/psdk/commctrl.h branches/header-work/include/reactos/subsys/csrss/csrss.h branches/header-work/subsystems/win32/csrss/win32csr/coninput.c branches/header-work/subsystems/win32/csrss/win32csr/conio.h branches/header-work/subsystems/win32/csrss/win32csr/conoutput.c branches/header-work/subsystems/win32/csrss/win32csr/guiconsole.c branches/header-work/subsystems/win32/csrss/win32csr/lineinput.c branches/header-work/subsystems/win32/csrss/win32csr/tuiconsole.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/l… Modified: branches/header-work/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… Modified: branches/header-work/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… Modified: branches/header-work/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/proce… Modified: branches/header-work/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/commct… Modified: branches/header-work/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/sub… Modified: branches/header-work/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs…

14 years, 6 months

[tkreuzer] 47697: [PSDK] Merge 47681 and 47682 from header branch - Add missing file headers - Fix defintition of POINTER_64 - by Amine Khaldi

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 8 16:31:31 2010 New Revision: 47697 URL: http://svn.reactos.org/svn/reactos?rev=47697&view=rev Log: [PSDK] Merge 47681 and 47682 from header branch - Add missing file headers - Fix defintition of POINTER_64 - by Amine Khaldi Modified: trunk/reactos/ (props changed) trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/usb.h trunk/reactos/include/psdk/usb100.h trunk/reactos/include/psdk/usb200.h trunk/reactos/include/psdk/usbcamdi.h trunk/reactos/include/psdk/usbdi.h trunk/reactos/include/psdk/usbioctl.h trunk/reactos/include/psdk/usbiodef.h trunk/reactos/include/psdk/usbrpmif.h trunk/reactos/include/psdk/usbuser.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 8 16:31:31 2010 @@ -1,4 +1,4 @@ -/branches/header-work:45691-46463 +/branches/header-work:45691-46463,47681-47682 /branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,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,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,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,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-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,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -13,6 +13,32 @@ #ifndef __int64 #define __int64 long long #endif +#endif + +#if defined(_MSC_VER) && (_MSC_VER < 1300) +#error Old MSVC compiler version. +#endif + +#ifdef _MAC +#error Not supported. +#endif + +#if !defined(MIDL_PASS) && !defined(RC_INVOKED) + #define POINTER_64 __ptr64 + #if defined(_WIN64) + #define POINTER_32 __ptr32 + #else + #define POINTER_32 + #endif +#else + #define POINTER_64 + #define POINTER_32 +#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */ + +#if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64) + typedef unsigned __int64 POINTER_64_INT; +#else + typedef unsigned long POINTER_64_INT; #endif #if defined(_WIN64) Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -19,8 +19,6 @@ #define __GNU_EXTENSION #endif #endif - -typedef unsigned long POINTER_64; // FIXME! HACK!!! /* Pseudo Modifiers for Input Parameters */ Modified: trunk/reactos/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=476… ============================================================================== --- trunk/reactos/include/psdk/usb.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,6 +1,26 @@ +/* + * usb.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: trunk/reactos/include/psdk/usb100.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb100.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/usb100.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb100.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB 1.0 support * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb200.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb200.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,6 +1,26 @@ +/* + * usb200.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: trunk/reactos/include/psdk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbcamdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB Camera driver interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbdi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/usbdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -5,7 +5,7 @@ * * FIXME : Obsolete header.. Use usb.h instead. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB IOCTL interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbiodef.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,3 +1,23 @@ +/* + * usbiodef.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #define USB_SUBMIT_URB 0 Modified: trunk/reactos/include/psdk/usbrpmif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbrpmif.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,3 +1,23 @@ +/* + * usbrpmif.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Amine Khaldi <amine.khaldi(a)reactos.org> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #include "windef.h" Modified: trunk/reactos/include/psdk/usbuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/usbuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbuser.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB user mode IOCTL interface * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>

14 years, 6 months

[gedmurphy] 47696: Move UTF8 to the bottom of the file. Thanks to Christoph for the tip

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 8 13:09:32 2010 New Revision: 47696 URL: http://svn.reactos.org/svn/reactos?rev=47696&view=rev Log: Move UTF8 to the bottom of the file. Thanks to Christoph for the tip Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Tue Jun 8 13:09:32 2010 @@ -92,27 +92,29 @@ #include "comctl_Bg.rc" #include "comctl_Cs.rc" -#include "comctl_De.rc" #include "comctl_El.rc" +#include "comctl_Eo.rc" #include "comctl_En.rc" -#include "comctl_Eo.rc" #include "comctl_Es.rc" -#include "comctl_Fr.rc" #include "comctl_Hu.rc" #include "comctl_It.rc" -#include "comctl_Ja.rc" #include "comctl_Ko.rc" -#include "comctl_Lt.rc" #include "comctl_Nl.rc" #include "comctl_No.rc" #include "comctl_Pl.rc" -#include "comctl_Pt.rc" -#include "comctl_Ro.rc" -#include "comctl_Ru.rc" -#include "comctl_Si.rc" #include "comctl_Sk.rc" #include "comctl_Sv.rc" #include "comctl_Th.rc" #include "comctl_Tr.rc" #include "comctl_Uk.rc" + +/* UTF-8 */ +#include "comctl_De.rc" +#include "comctl_Fr.rc" +#include "comctl_Ja.rc" +#include "comctl_Lt.rc" +#include "comctl_Pt.rc" +#include "comctl_Ro.rc" +#include "comctl_Ru.rc" +#include "comctl_Si.rc" #include "comctl_Zh.rc"

14 years, 6 months

[gedmurphy] 47695: Part 1 of the comctl32 sync. I'll do it in 2 stages for testing purposes as it's a very large patch. This part includes alpha support for imagelists and tango icons for the common toolbars I'll do the second part later today. It has a propsheet bug and I'm a bit busy at the mo.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 8 12:21:26 2010 New Revision: 47695 URL: http://svn.reactos.org/svn/reactos?rev=47695&view=rev Log: Part 1 of the comctl32 sync. I'll do it in 2 stages for testing purposes as it's a very large patch. This part includes alpha support for imagelists and tango icons for the common toolbars I'll do the second part later today. It has a propsheet bug and I'm a bit busy at the mo. Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_El.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Lt.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ro.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sk.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/comctl_Zh.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp trunk/reactos/dll/win32/comctl32/idb_std_large.bmp trunk/reactos/dll/win32/comctl32/idb_std_small.bmp trunk/reactos/dll/win32/comctl32/idb_view_large.bmp trunk/reactos/dll/win32/comctl32/idb_view_small.bmp trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/imagelist.h trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Modified: trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Modified: trunk/reactos/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Modified: trunk/reactos/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Modified: trunk/reactos/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Modified: trunk/reactos/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca…

14 years, 6 months

[gedmurphy] 47694: Add missing info needed for the comctl32 sync

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 8 12:16:34 2010 New Revision: 47694 URL: http://svn.reactos.org/svn/reactos?rev=47694&view=rev Log: Add missing info needed for the comctl32 sync Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Tue Jun 8 12:16:34 2010 @@ -417,6 +417,8 @@ WINCOMMCTRLAPI WINBOOL WINAPI ImageList_GetImageInfo(HIMAGELIST himl,int i,IMAGEINFO *pImageInfo); WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST himl1,int i1,HIMAGELIST himl2,int i2,int dx,int dy); WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST himl); + WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void **ppv); + #endif #ifndef NOHEADER @@ -4447,11 +4449,16 @@ #define MCN_SELECT (MCN_FIRST+4) -#define MCS_DAYSTATE 0x1 -#define MCS_MULTISELECT 0x2 -#define MCS_WEEKNUMBERS 0x4 -#define MCS_NOTODAYCIRCLE 0x8 -#define MCS_NOTODAY 0x10 +#define MCS_DAYSTATE 0x0001 +#define MCS_MULTISELECT 0x0002 +#define MCS_WEEKNUMBERS 0x0004 +#define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTODAY 0x0010 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 +#define MCS_NOSELCHANGEONNAV 0x0100 +#endif #define GMR_VISIBLE 0 #define GMR_DAYSTATE 1

14 years, 6 months

[jmorlan] 47693: [KERNEL32], [WIN32CSR] - Implement ReadConsoleW's CONSOLE_READCONSOLE_CONTROL structure. - Make pressing Insert during line input work

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Jun 8 08:38:14 2010 New Revision: 47693 URL: http://svn.reactos.org/svn/reactos?rev=47693&view=rev Log: [KERNEL32], [WIN32CSR] - Implement ReadConsoleW's CONSOLE_READCONSOLE_CONTROL structure. - Make pressing Insert during line input work Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -1698,37 +1698,45 @@ PVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, - PCONSOLE_READCONSOLE_CONTROL lpReserved, + PCONSOLE_READCONSOLE_CONTROL pInputControl, BOOL bUnicode) { - PCSR_API_MESSAGE Request; - ULONG CsrRequest; - NTSTATUS Status; - ULONG CharSize, CharsRead = 0; - - CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - Request = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + min(nNumberOfCharsToRead, - CSRSS_MAX_READ_CONSOLE / CharSize) * CharSize)); - if (Request == NULL) + CSR_API_MESSAGE Request; + PCSR_CAPTURE_BUFFER CaptureBuffer; + ULONG CsrRequest = MAKE_CSR_API(READ_CONSOLE, CSR_CONSOLE); + NTSTATUS Status = STATUS_SUCCESS; + ULONG CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + CaptureBuffer = CsrAllocateCaptureBuffer(1, nNumberOfCharsToRead * CharSize); + if (CaptureBuffer == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Request->Status = STATUS_SUCCESS; - Request->Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; - Request->Data.ReadConsoleRequest.Unicode = bUnicode; - Request->Data.ReadConsoleRequest.FullReadSize = (WORD)nNumberOfCharsToRead; - CsrRequest = MAKE_CSR_API(READ_CONSOLE, CSR_CONSOLE); + CsrAllocateMessagePointer(CaptureBuffer, + nNumberOfCharsToRead * CharSize, + &Request.Data.ReadConsoleRequest.Buffer); + + Request.Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; + Request.Data.ReadConsoleRequest.Unicode = bUnicode; + Request.Data.ReadConsoleRequest.NrCharactersToRead = (WORD)nNumberOfCharsToRead; + Request.Data.ReadConsoleRequest.NrCharactersRead = 0; + Request.Data.ReadConsoleRequest.CtrlWakeupMask = 0; + if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + { + Request.Data.ReadConsoleRequest.NrCharactersRead = pInputControl->nInitialChars; + memcpy(Request.Data.ReadConsoleRequest.Buffer, + lpBuffer, + pInputControl->nInitialChars * sizeof(WCHAR)); + Request.Data.ReadConsoleRequest.CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; + } do { - if (Request->Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { - Status = NtWaitForSingleObject(Request->Data.ReadConsoleRequest.EventHandle, + Status = NtWaitForSingleObject(Request.Data.ReadConsoleRequest.EventHandle, FALSE, 0); if (!NT_SUCCESS(Status)) @@ -1738,37 +1746,28 @@ } } - Request->Data.ReadConsoleRequest.NrCharactersToRead = (WORD)min(nNumberOfCharsToRead, CSRSS_MAX_READ_CONSOLE / CharSize); - - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) - + Request->Data.ReadConsoleRequest.NrCharactersToRead * CharSize)); - - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { DPRINT1("CSR returned error in ReadConsole\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + CsrFreeCaptureBuffer(CaptureBuffer); SetLastErrorByStatus(Status); return FALSE; } - - nNumberOfCharsToRead -= Request->Data.ReadConsoleRequest.NrCharactersRead; - memcpy((PVOID)((ULONG_PTR)lpBuffer + (ULONG_PTR)(CharsRead * CharSize)), - Request->Data.ReadConsoleRequest.Buffer, - Request->Data.ReadConsoleRequest.NrCharactersRead * CharSize); - CharsRead += Request->Data.ReadConsoleRequest.NrCharactersRead; - } - while (Request->Status == STATUS_PENDING && nNumberOfCharsToRead > 0); + } + while (Status == STATUS_PENDING); + + memcpy(lpBuffer, + Request.Data.ReadConsoleRequest.Buffer, + Request.Data.ReadConsoleRequest.NrCharactersRead * CharSize); if (lpNumberOfCharsRead != NULL) - { - *lpNumberOfCharsRead = CharsRead; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + *lpNumberOfCharsRead = Request.Data.ReadConsoleRequest.NrCharactersRead; + + if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + pInputControl->dwControlKeyState = Request.Data.ReadConsoleRequest.ControlKeyState; + + CsrFreeCaptureBuffer(CaptureBuffer); return TRUE; } @@ -1791,7 +1790,7 @@ lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, - pInputControl, + NULL, FALSE); } Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -70,11 +70,13 @@ { HANDLE ConsoleHandle; BOOL Unicode; - WORD FullReadSize; WORD NrCharactersToRead; + WORD NrCharactersRead; HANDLE EventHandle; - ULONG NrCharactersRead; - BYTE Buffer[0]; + PVOID Buffer; + UNICODE_STRING ExeName; + DWORD CtrlWakeupMask; + DWORD ControlKeyState; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct @@ -515,7 +517,6 @@ #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB)) -#define CSRSS_MAX_READ_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -37,13 +37,18 @@ CharSize = (Request->Data.ReadConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - /* truncate length to CSRSS_MAX_READ_CONSOLE_REQUEST */ - nNumberOfCharsToRead = min(Request->Data.ReadConsoleRequest.NrCharactersToRead, CSRSS_MAX_READ_CONSOLE / CharSize); + nNumberOfCharsToRead = Request->Data.ReadConsoleRequest.NrCharactersToRead; Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Buffer = (PCHAR)Request->Data.ReadConsoleRequest.Buffer; UnicodeBuffer = (PWCHAR)Buffer; + if (!Win32CsrValidateBuffer(ProcessData, Buffer, nNumberOfCharsToRead, CharSize)) + return STATUS_ACCESS_VIOLATION; + + if (Request->Data.ReadConsoleRequest.NrCharactersRead * sizeof(WCHAR) > nNumberOfCharsToRead * CharSize) + return STATUS_INVALID_PARAMETER; + Status = ConioLockConsole(ProcessData, Request->Data.ReadConsoleRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) @@ -58,7 +63,7 @@ if (Console->LineBuffer == NULL) { /* Starting a new line */ - Console->LineMaxSize = max(256, Request->Data.ReadConsoleRequest.FullReadSize); + Console->LineMaxSize = max(256, nNumberOfCharsToRead); Console->LineBuffer = HeapAlloc(Win32CsrApiHeap, 0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) { @@ -66,9 +71,19 @@ goto done; } Console->LineComplete = FALSE; - Console->LineSize = 0; - Console->LinePos = 0; Console->LineUpPressed = FALSE; + Console->LineInsertToggle = 0; + Console->LineWakeupMask = Request->Data.ReadConsoleRequest.CtrlWakeupMask; + Console->LineSize = Request->Data.ReadConsoleRequest.NrCharactersRead; + Console->LinePos = Console->LineSize; + /* pre-filling the buffer is only allowed in the Unicode API, + * so we don't need to worry about conversion */ + memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); + if (Console->LineSize == Console->LineMaxSize) + { + Console->LineComplete = TRUE; + Console->LinePos = 0; + } } /* If we don't have a complete line yet, process the pending input */ @@ -87,6 +102,7 @@ && Input->InputEvent.Event.KeyEvent.bKeyDown) { LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); + Request->Data.ReadConsoleRequest.ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; } HeapFree(Win32CsrApiHeap, 0, Input); } @@ -104,10 +120,11 @@ } if (Console->LinePos == Console->LineSize) { + /* Entire line has been read */ HeapFree(Win32CsrApiHeap, 0, Console->LineBuffer); Console->LineBuffer = NULL; - Status = STATUS_SUCCESS; /* Entire line has been read */ - } + } + Status = STATUS_SUCCESS; } } else @@ -141,12 +158,6 @@ done: Request->Data.ReadConsoleRequest.NrCharactersRead = i; ConioUnlockConsole(Console); - - if (CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + i * CharSize > sizeof(CSR_API_MESSAGE)) - { - Request->Header.u1.s1.TotalLength = CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + i * CharSize; - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - } return Status; } @@ -355,6 +366,12 @@ current_entry = current_entry->Flink; ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); } + if (Console->LineBuffer && !Console->LineComplete) + { + /* Line input is in progress; end it */ + Console->LinePos = Console->LineSize = 0; + Console->LineComplete = TRUE; + } return; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -81,6 +81,8 @@ WORD LinePos; /* current position within line */ BOOLEAN LineComplete; /* user pressed enter, ready to send back to client */ BOOLEAN LineUpPressed; + BOOLEAN LineInsertToggle; /* replace character over cursor instead of inserting */ + ULONG LineWakeupMask; /* bitmap of which control characters will end line input */ LIST_ENTRY HistoryBuffers; WORD HistoryBufferSize; /* size for newly created history buffers */ WORD NumberOfHistoryBuffers; /* maximum number of history buffers allowed */ @@ -192,6 +194,7 @@ CHAR *Buffer, DWORD Length, BOOL Attrib); NTSTATUS FASTCALL CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer); VOID WINAPI ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer); +DWORD FASTCALL ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale); CSR_API(CsrWriteConsole); CSR_API(CsrGetScreenBufferInfo); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -865,6 +865,16 @@ return STATUS_SUCCESS; } +DWORD FASTCALL +ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale) +{ + DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100; + /* If line input in progress, perhaps adjust for insert toggle */ + if (Console->LineBuffer && !Console->LineComplete && Console->LineInsertToggle) + return (Size * 2 <= Scale) ? (Size * 2) : (Size / 2); + return Size; +} + CSR_API(CsrGetCursorInfo) { PCSRSS_SCREEN_BUFFER Buff; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -946,11 +946,7 @@ if (LeftChar <= CursorX && CursorX <= RightChar && TopLine <= CursorY && CursorY <= BottomLine) { - CursorHeight = (GuiData->CharHeight * Buff->CursorInfo.dwSize) / 100; - if (CursorHeight < 1) - { - CursorHeight = 1; - } + CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); From = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY) + 1; if (*From != DEFAULT_ATTRIB) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -459,6 +459,11 @@ LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); } return; + case VK_INSERT: + /* Toggle between insert and overstrike */ + Console->LineInsertToggle = !Console->LineInsertToggle; + ConioSetCursorInfo(Console, Console->ActiveBuffer); + return; case VK_DELETE: /* Remove character to right of cursor */ if (Pos != Console->LineSize) @@ -555,7 +560,12 @@ Console->LineBuffer[Console->LineSize++] = L'\r'; if (Console->Mode & ENABLE_ECHO_INPUT) ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); - if (Console->Mode & ENABLE_PROCESSED_INPUT) + + /* Add \n if processed input. There should usually be room for it, + * but an exception to the rule exists: the buffer could have been + * pre-filled with LineMaxSize - 1 characters. */ + if (Console->Mode & ENABLE_PROCESSED_INPUT && + Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n'; if (Console->Mode & ENABLE_ECHO_INPUT) @@ -566,8 +576,21 @@ } else if (KeyEvent->uChar.UnicodeChar != L'\0') { - /* Normal character */ - LineInputEdit(Console, 0, 1, &KeyEvent->uChar.UnicodeChar); + if (KeyEvent->uChar.UnicodeChar < 0x20 && + Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) + { + /* Control key client wants to handle itself (e.g. for tab completion) */ + Console->LineBuffer[Console->LineSize++] = L' '; + Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else + { + /* Normal character */ + BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; + LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); + } } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -208,6 +208,7 @@ static BOOL WINAPI TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) { + CONSOLE_CURSOR_INFO Info; DWORD BytesReturned; if (ActiveConsole->ActiveBuffer != Buff) @@ -215,9 +216,11 @@ return TRUE; } + Info.dwSize = ConioEffectiveCursorSize(Console, 100); + Info.bVisible = Buff->CursorInfo.bVisible; + if (! DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_CURSOR_INFO, - &Buff->CursorInfo, sizeof(Buff->CursorInfo), NULL, 0, - &BytesReturned, NULL)) + &Info, sizeof(Info), NULL, 0, &BytesReturned, NULL)) { DPRINT1( "Failed to set cursor info\n" ); return FALSE;

14 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010