Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19272: Add some SEH protection (not complete yet)
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Add some SEH protection (not complete yet) Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-11-16 20:38:31 UTC (rev 19271) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-11-16 20:52:07 UTC (rev 19272) @@ -396,37 +396,33 @@ return Ret; } -HBITMAP STDCALL -NtGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPerPel, - CONST VOID *Bits) +static FASTCALL HBITMAP +IntCreateBitmapIndirect(CONST BITMAP *BM) { PBITMAPOBJ bmp; HBITMAP hBitmap; SIZEL Size; + UINT BitsPixel; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPerPel = (BYTE)BitsPerPel * (BYTE)Planes; + BitsPixel = BM->bmBitsPixel * BM->bmPlanes; /* Check parameters */ - if (!Height || !Width) + if (0 == BM->bmHeight || 0 == BM->bmWidth) { Size.cx = Size.cy = 1; } else { - Size.cx = abs(Width); - Size.cy = abs(Height); + Size.cx = abs(BM->bmWidth); + Size.cy = abs(BM->bmHeight); } /* Create the bitmap object. */ - hBitmap = IntCreateBitmap(Size, BITMAPOBJ_GetWidthBytes(Width, BitsPerPel), - BitmapFormat(BitsPerPel, BI_RGB), - (Height < 0 ? BMF_TOPDOWN : 0) | - (Bits == NULL ? 0 : BMF_NOZEROINIT), NULL); + hBitmap = IntCreateBitmap(Size, BM->bmWidthBytes, + BitmapFormat(BitsPixel, BI_RGB), + (BM->bmHeight < 0 ? BMF_TOPDOWN : 0) | + (NULL == BM->bmBits ? 0 : BMF_NOZEROINIT), NULL); if (!hBitmap) { DPRINT("NtGdiCreateBitmap: IntCreateBitmap returned 0\n"); @@ -434,7 +430,7 @@ } DPRINT("NtGdiCreateBitmap:%dx%d, %d BPP colors returning %08x\n", - Size.cx, Size.cy, BitsPerPel, hBitmap); + Size.cx, Size.cy, BitsPixel, hBitmap); bmp = BITMAPOBJ_LockBitmap( hBitmap ); /* FIXME - bmp can be NULL!!!!!! */ @@ -447,14 +443,35 @@ * to us it should be safe. */ - if (Bits != NULL) + if (NULL != BM->bmBits) { - NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, Bits); + NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, BM->bmBits); } return hBitmap; } +HBITMAP STDCALL +NtGdiCreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + CONST VOID *Bits) +{ + BITMAP BM; + + BM.bmType = 0; + BM.bmWidth = Width; + BM.bmHeight = Height; + BM.bmWidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); + BM.bmPlanes = Planes; + BM.bmBitsPixel = BitsPixel; + BM.bmBits = (LPVOID) Bits; + + return IntCreateBitmapIndirect(&BM); +} + BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody) { @@ -542,13 +559,32 @@ } HBITMAP STDCALL -NtGdiCreateBitmapIndirect(CONST BITMAP *BM) +NtGdiCreateBitmapIndirect(CONST BITMAP *UnsafeBM) { - return NtGdiCreateBitmap (BM->bmWidth, - BM->bmHeight, - BM->bmPlanes, - BM->bmBitsPixel, - BM->bmBits); + BITMAP BM; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + ProbeForRead(UnsafeBM, sizeof(BITMAP), 1); + BM = *UnsafeBM; + if (NULL != BM.bmBits) + { + ProbeForRead(BM.bmBits, BM.bmWidthBytes * abs(BM.bmHeight), 2); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + + return IntCreateBitmapIndirect(&BM); } HBITMAP STDCALL @@ -1478,7 +1514,7 @@ if (Bitmap->SurfObj.lDelta >= 0) bm.bmHeight = -bm.bmHeight; - res = NtGdiCreateBitmapIndirect(&bm); + res = IntCreateBitmapIndirect(&bm); if(res) { char *buf;

1 0

[fireball] 19271: Fix IoIsWdmVersionAvailable() to confirm we're compatible with Win2k (someone forgot 0x before 10) and also added brief comments on which version corresponds to what.
by fireball＠svn.reactos.com 16 Nov '05

16 Nov '05

Fix IoIsWdmVersionAvailable() to confirm we're compatible with Win2k (someone forgot 0x before 10) and also added brief comments on which version corresponds to what. Modified: trunk/reactos/ntoskrnl/io/iomgr.c _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-16 17:34:50 UTC (rev 19270) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-11-16 20:38:31 UTC (rev 19271) @@ -483,7 +483,14 @@ IoIsWdmVersionAvailable(IN UCHAR MajorVersion, IN UCHAR MinorVersion) { - if (MajorVersion <= 1 && MinorVersion <= 10) + /* MinorVersion = 0x20 : WinXP + 0x10 : Win2k + 0x5 : WinMe + <0x5 : Win98 + + We report Win2k now + */ + if (MajorVersion <= 1 && MinorVersion <= 0x10) return TRUE; return FALSE; }

1 0

[hpoussin] 19270: Export _vsnwprintf
by hpoussin＠svn.reactos.com 16 Nov '05

16 Nov '05

Export _vsnwprintf Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-11-16 16:12:59 UTC (rev 19269) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-11-16 17:34:50 UTC (rev 19270) @@ -1436,6 +1436,7 @@ _strset _strupr _vsnprintf +_vsnwprintf _wcsicmp _wcslwr _wcsnicmp

1 0

[gvg] 19269: StartScan is always in BOTTOM_UP sense for GetDIBits
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

StartScan is always in BOTTOM_UP sense for GetDIBits Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:10:57 UTC (rev 19268) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:12:59 UTC (rev 19269) @@ -498,7 +498,8 @@ DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette); SourcePoint.x = 0; - SourcePoint.y = StartScan; + SourcePoint.y = BitmapObj->SurfObj.sizlBitmap.cy - + (StartScan + ScanLines); /* Determine destination rectangle */ DestRect.top = 0;

1 0

[gvg] 19268: Always pad scanlines to multiples of 4 bytes for DIBs
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Always pad scanlines to multiples of 4 bytes for DIBs Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:05:55 UTC (rev 19267) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:10:57 UTC (rev 19268) @@ -449,7 +449,8 @@ DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; DestBitmap = EngCreateBitmap( - DestSize, BitmapObj->SurfObj.lDelta, + DestSize, DIB_GetDIBWidthBytes(DestSize.cx, + Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits); @@ -667,6 +668,7 @@ int height; WORD bpp; WORD compr; + SIZEL size; if (DIB_GetBitmapInfo( header, &width, &height, &bpp, &compr ) == -1) return 0; @@ -721,7 +723,12 @@ } else { - handle = NtGdiCreateBitmap( width, height, 1, 1, NULL); + size.cx = width; + size.cy = abs(height); + + handle = IntCreateBitmap(size, DIB_GetDIBWidthBytes(width, 1), BMF_1BPP, + (height < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, + NULL); } if (height < 0) @@ -986,24 +993,7 @@ */ INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { - int words; - - switch(depth) - { - case 1: words = (width + 31) >> 5; break; - case 4: words = (width + 7) >> 3; break; - case 8: words = (width + 3) >> 2; break; - case 15: - case 16: words = (width + 1) >> 1; break; - case 24: words = (width * 3 + 3) >> 2; break; - - default: - DPRINT("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return words << 2; + return ((width * depth + 31) & ~31) >> 3; } /***********************************************************************

1 0

[gvg] 19267: Pass correct masks when creating bitfield palette
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Pass correct masks when creating bitfield palette Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 15:53:16 UTC (rev 19266) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-16 16:05:55 UTC (rev 19267) @@ -1149,6 +1149,7 @@ ULONG ColorCount; PALETTEENTRY *palEntries = NULL; HPALETTE hPal; + ULONG RedMask, GreenMask, BlueMask; // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1161,10 +1162,16 @@ else if(bits < 24) { *paletteType = PAL_BITFIELDS; + RedMask = 0xf800; + GreenMask = 0x07e0; + BlueMask = 0x001f; } else { *paletteType = PAL_BGR; + RedMask = 0xff0000; + GreenMask = 0x00ff00; + BlueMask = 0x0000ff; } if (bmi->bmiHeader.biClrUsed == 0) @@ -1182,7 +1189,9 @@ } else { - hPal = PALETTE_AllocPalette( *paletteType, ColorCount, (ULONG*)palEntries, 0, 0, 0 ); + hPal = PALETTE_AllocPalette(*paletteType, ColorCount, + (ULONG*) palEntries, + RedMask, GreenMask, BlueMask ); } return hPal;

1 0

[cwittich] 19266: fix memory leak in case of error
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

fix memory leak in case of error Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-16 15:14:31 UTC (rev 19265) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-16 15:53:16 UTC (rev 19266) @@ -66,6 +66,7 @@ FullInfPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!FullInfPathW) { + HeapFree(GetProcessHeap(), 0, HardwareIdW); SetLastError(ERROR_GEN_FAILURE); return FALSE; }

1 0

[hpoussin] 19265: Try to fix the problem some people reported (no keyboard and mouse at 3rd reboot)
by hpoussin＠svn.reactos.com 16 Nov '05

16 Nov '05

Try to fix the problem some people reported (no keyboard and mouse at 3rd reboot) Modified: trunk/reactos/media/inf/keyboard.inf _____ Modified: trunk/reactos/media/inf/keyboard.inf --- trunk/reactos/media/inf/keyboard.inf 2005-11-16 14:57:50 UTC (rev 19264) +++ trunk/reactos/media/inf/keyboard.inf 2005-11-16 15:14:31 UTC (rev 19265) @@ -53,7 +53,7 @@ [kbdclass_Service_Inst] ServiceType = 1 -StartType = 3 +StartType = 1 ErrorControl = 1 ServiceBinary = %12%\kbdclass.sys LoadOrderGroup = Keyboard Class

1 0

[cwittich] 19264: added UpdateDriverForPlugAndPlayDevicesA (untested)
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

added UpdateDriverForPlugAndPlayDevicesA (untested) Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-16 13:24:13 UTC (rev 19263) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-16 14:57:50 UTC (rev 19264) @@ -22,6 +22,68 @@ HINSTANCE hDllInstance; HANDLE hThread; +/* +* @unimplemented +*/ +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesW( + IN HWND hwndParent, + IN LPCWSTR HardwareId, + IN LPCWSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +/* +* @implemented +*/ +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesA( + IN HWND hwndParent, + IN LPCSTR HardwareId, + IN LPCSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + BOOL Result; + LPWSTR HardwareIdW = NULL; + LPWSTR FullInfPathW = NULL; + + int len = MultiByteToWideChar(CP_ACP, 0, HardwareId, -1, NULL, 0); + HardwareIdW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!HardwareIdW) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + MultiByteToWideChar(CP_ACP, 0, HardwareId, -1, HardwareIdW, len); + + len = MultiByteToWideChar(CP_ACP, 0, FullInfPath, -1, NULL, 0); + FullInfPathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!FullInfPathW) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + MultiByteToWideChar(CP_ACP, 0, FullInfPath, -1, FullInfPathW, len); + + Result = UpdateDriverForPlugAndPlayDevicesW(hwndParent, + HardwareIdW, + FullInfPathW, + InstallFlags, + bRebootRequired); + + HeapFree(GetProcessHeap(), 0, HardwareIdW); + HeapFree(GetProcessHeap(), 0, FullInfPathW); + + return Result; +} + + static HFONT CreateTitleFont(VOID) { _____ Modified: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-11-16 13:24:13 UTC (rev 19263) +++ trunk/reactos/lib/newdev/stubs.c 2005-11-16 14:57:50 UTC (rev 19264) @@ -36,29 +36,6 @@ return FALSE; } -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesA( - IN HWND hwndParent, - IN LPCSTR HardwareId, - IN LPCSTR FullInfPath, - IN DWORD InstallFlags, - OUT PBOOL bRebootRequired OPTIONAL) -{ - UNIMPLEMENTED; - SetLastError(ERROR_GEN_FAILURE); - return FALSE; -} -BOOL WINAPI -UpdateDriverForPlugAndPlayDevicesW( - IN HWND hwndParent, - IN LPCWSTR HardwareId, - IN LPCWSTR FullInfPath, - IN DWORD InstallFlags, - OUT PBOOL bRebootRequired OPTIONAL) -{ - UNIMPLEMENTED; - SetLastError(ERROR_GEN_FAILURE); - return FALSE; -} +

1 0

[cwittich] 19263: fixed bug 791
by cwittich＠svn.reactos.com 16 Nov '05

16 Nov '05

fixed bug 791 Modified: trunk/reactos/tools/rbuild/project.cpp _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-16 11:24:41 UTC (rev 19262) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-16 13:24:13 UTC (rev 19263) @@ -227,6 +227,9 @@ } } + if (node == NULL) + node = head->subElements[0]; + throw InvalidBuildFileException ( node->location, "Document contains no 'project' tag." );

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005