Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 47738: [USER32_WINETEST] - Re-enable generated.c tests. This commit (the previous one too) is a result of the header work reintegration.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 16:06:10 2010 New Revision: 47738 URL: http://svn.reactos.org/svn/reactos?rev=47738&view=rev Log: [USER32_WINETEST] - Re-enable generated.c tests. This commit (the previous one too) is a result of the header work reintegration. Modified: trunk/rostests/winetests/user32/testlist.c trunk/rostests/winetests/user32/user32.rbuild Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… ============================================================================== --- trunk/rostests/winetests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/testlist.c [iso-8859-1] Thu Jun 10 16:06:10 2010 @@ -42,7 +42,7 @@ { "dde", func_dde }, { "dialog", func_dialog }, { "edit", func_edit }, -// { "generated", func_generated }, + { "generated", func_generated }, { "input", func_input }, { "listbox", func_listbox }, { "menu", func_menu }, Modified: trunk/rostests/winetests/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/user32.r… ============================================================================== --- trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/user32.rbuild [iso-8859-1] Thu Jun 10 16:06:10 2010 @@ -17,7 +17,7 @@ <file>dde.c</file> <file>dialog.c</file> <file>edit.c</file> -  + <file>generated.c</file> <file>input.c</file> <file>listbox.c</file> <file>menu.c</file>

1 0

[akhaldi] 47737: [NTDLL_WINETEST] - Re-enable generated.c tests.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 15:55:07 2010 New Revision: 47737 URL: http://svn.reactos.org/svn/reactos?rev=47737&view=rev Log: [NTDLL_WINETEST] - Re-enable generated.c tests. Modified: trunk/rostests/winetests/ntdll/ntdll.rbuild trunk/rostests/winetests/ntdll/testlist.c Modified: trunk/rostests/winetests/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ntdll.rbu… ============================================================================== --- trunk/rostests/winetests/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/ntdll.rbuild [iso-8859-1] Thu Jun 10 15:55:07 2010 @@ -12,6 +12,7 @@ <file>error.c</file> <file>exception.c</file> <file>file.c</file> + <file>generated.c</file> <file>info.c</file> <file>large_int.c</file> <file>om.c</file> Modified: trunk/rostests/winetests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/testlist.… ============================================================================== --- trunk/rostests/winetests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/testlist.c [iso-8859-1] Thu Jun 10 15:55:07 2010 @@ -35,7 +35,7 @@ { "error", func_error }, { "exception", func_exception }, { "file", func_file }, - //{ "generated", func_generated }, + { "generated", func_generated }, { "info", func_info }, { "large_int", func_large_int }, { "om", func_om },

1 0

[akhaldi] 47736: [PSDK] - Deduplicate/improve architecture related definitions.
by akhaldi＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: akhaldi Date: Thu Jun 10 15:35:16 2010 New Revision: 47736 URL: http://svn.reactos.org/svn/reactos?rev=47736&view=rev Log: [PSDK] - Deduplicate/improve architecture related definitions. Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h 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] Thu Jun 10 15:35:16 2010 @@ -21,6 +21,29 @@ #ifdef _MAC #error Not supported. +#endif + +#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ + !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) + +#if defined(_M_IX86) +#define _X86_ +#elif defined(_M_AMD64) || defined(__x86_64__) +#define _AMD64_ +#elif defined(_M_IA64) || defined(__ia64__) +#define _IA64_ +#elif defined(_M_ALPHA) || defined(__alpha__) +#define _ALPHA_ +#elif defined(_M_ARM) || defined(__arm__) +#define _ARM_ +#elif defined(_M_PPC) || defined(__powerpc__) +#define _PPC_ +#elif defined(_M_MRX000) || defined(__mips__) +#define _MIPS_ +#elif defined(_M_M68K) || defined(__68k__) +#define _68K_ +#endif + #endif #if !defined(MIDL_PASS) && !defined(RC_INVOKED) Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -17,18 +17,27 @@ #include <msvctarget.h> #endif -#if defined(_M_IX86) && !defined(_X86_) +#if !defined(_X86_) && !defined(_AMD64) && !defined(_IA64_) && !defined(_ALPHA_) && \ + !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) + +#if defined(_M_IX86) #define _X86_ -#elif defined(_M_ALPHA) && !defined(_ALPHA_) +#elif defined(_M_AMD64) || defined(__x86_64__) +#define _AMD64_ +#elif defined(_M_IA64) || defined(__ia64__) +#define _IA64_ +#elif defined(_M_ALPHA) || defined(__alpha__) #define _ALPHA_ -#elif defined(_M_ARM) && !defined(_ARM_) +#elif defined(_M_ARM) || defined(__arm__) #define _ARM_ -#elif defined(_M_PPC) && !defined(_PPC_) +#elif defined(_M_PPC) || defined(__powerpc__) #define _PPC_ -#elif defined(_M_MRX000) && !defined(_MIPS_) +#elif defined(_M_MRX000) || defined(__mips__) #define _MIPS_ -#elif defined(_M_M68K) && !defined(_68K_) +#elif defined(_M_M68K) || defined(__68k__) #define _68K_ +#endif + #endif #ifdef RC_INVOKED Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Jun 10 15:35:16 2010 @@ -9,20 +9,6 @@ #ifdef __GNUC__ #include <msvctarget.h> -#endif - -#if defined(_M_IX86) && !defined(_X86_) -#define _X86_ -#elif defined(_M_ALPHA) && !defined(_ALPHA_) -#define _ALPHA_ -#elif defined(_M_ARM) && !defined(_ARM_) -#define _ARM_ -#elif defined(_M_PPC) && !defined(_PPC_) -#define _PPC_ -#elif defined(_M_MRX000) && !defined(_MIPS_) -#define _MIPS_ -#elif defined(_M_M68K) && !defined(_68K_) -#define _68K_ #endif #ifndef DECLSPEC_ALIGN

1 0

[jgardou] 47735: [GDI32] - DIB data is not mandatory in CreateDIBitmap [WIN32K] - Simplify GreCreateDIBitmap - Surface data should be 16 bits aligned
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 14:32:05 2010 New Revision: 47735 URL: http://svn.reactos.org/svn/reactos?rev=47735&view=rev Log: [GDI32] - DIB data is not mandatory in CreateDIBitmap [WIN32K] - Simplify GreCreateDIBitmap - Surface data should be 16 bits aligned Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.c branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.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] Thu Jun 10 14:32:05 2010 @@ -461,8 +461,8 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - UINT InfoSize; - UINT cjBmpScanSize; + UINT InfoSize = 0; + UINT cjBmpScanSize = 0; HBITMAP hBmp; NTSTATUS Status = STATUS_SUCCESS; @@ -477,17 +477,20 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - _SEH2_TRY - { - cjBmpScanSize = DIB_BitmapBitsSize(Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END + if(Data) + { + _SEH2_TRY + { + cjBmpScanSize = DIB_BitmapBitsSize(Data); + CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); + InfoSize += Data->bmiHeader.biSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + } if(!NT_SUCCESS(Status)) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Thu Jun 10 14:32:05 2010 @@ -203,12 +203,12 @@ if (ulWidth) { /* Align the width (Windows compatibility) */ - ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 15) & ~15) >> 3; } else { /* Calculate width from the bitmap width in pixels */ - ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 15) & ~15) >> 3; } /* Calculate the bitmap size in bytes */ @@ -236,7 +236,7 @@ (fjBitmap & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - + /* Free the section already, but keep the mapping */ if (pvBits) EngFreeSectionMem(pvSection, NULL); } 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] Thu Jun 10 14:32:05 2010 @@ -1177,68 +1177,39 @@ PDC Dc; HBITMAP Bmp; WORD bpp; - - if (!hDc) // CreateBitmap + HDC hdcDest; + + if (!hDc) /* 1bpp monochrome bitmap */ { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. - hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); - if (!hDc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); + hdcDest = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + if(!hdcDest) + { return NULL; } - - Dc = DC_LockDc(hDc); - if (!Dc) - { - NtGdiDeleteObjectApp(hDc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); - - DC_UnlockDc(Dc); - NtGdiDeleteObjectApp(hDc); - } - else // CreateCompatibleBitmap - { - Dc = DC_LockDc(hDc); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - /* pbmi == null - First create an un-initialised bitmap. The depth of the bitmap - should match that of the hdc and not that supplied in bmih. - */ - if (pbmi) - bpp = pbmi->bmiHeader.bV5BitCount; - else - { - if (Dc->dctype != DC_TYPE_MEMORY) - bpp = Dc->ppdev->gdiinfo.cBitsPixel; - else - { - DIBSECTION dibs; - INT Count; - SURFACE *psurf = Dc->dclevel.pSurface; - Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); - if (!Count) - bpp = 1; - else - { - if (Count == sizeof(BITMAP)) - /* A device-dependent bitmap is selected in the DC */ - bpp = dibs.dsBm.bmBitsPixel; - else - /* A DIB section is selected in the DC */ - bpp = dibs.dsBmih.biBitCount; - } - } - } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); - DC_UnlockDc(Dc); + } + else + { + hdcDest = hDc; + } + + Dc = DC_LockDc(hdcDest); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + /* It's OK to set bpp=0 here, as IntCreateDIBitmap will create a compatible Bitmap + * if bpp != 1 and ignore the real value that was passed */ + if (pbmi) + bpp = pbmi->bmiHeader.bV5BitCount; + else + bpp = 0; + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); + DC_UnlockDc(Dc); + + if(!hDc) + { + NtGdiDeleteObjectApp(hdcDest); } return Bmp; }

1 0

[jgardou] 47734: [GDI32] - Protect CreateDIBitmap - Pass correct data size to NtGdiCreateDIBitmap
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 12:58:52 2010 New Revision: 47734 URL: http://svn.reactos.org/svn/reactos?rev=47734&view=rev Log: [GDI32] - Protect CreateDIBitmap - Pass correct data size to NtGdiCreateDIBitmap Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/bitmap.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] Thu Jun 10 12:58:52 2010 @@ -461,9 +461,10 @@ LONG width, height, compr, dibsize; WORD planes, bpp; // PDC_ATTR pDc_Attr; - UINT ConvertedInfoSize; + UINT InfoSize; UINT cjBmpScanSize; HBITMAP hBmp; + NTSTATUS Status = STATUS_SUCCESS; if (!Header) return 0; @@ -476,9 +477,25 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - /* 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); + _SEH2_TRY + { + cjBmpScanSize = DIB_BitmapBitsSize(Data); + CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); + InfoSize += Data->bmiHeader.biSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); @@ -491,7 +508,7 @@ (LPBYTE)Bits, (LPBITMAPINFO)Data, ColorUse, - ConvertedInfoSize, + InfoSize, cjBmpScanSize, 0, 0);

1 0

[jgardou] 47733: [WIN32K] - Split NtGdiCreateDIBitmapInternal with its Gre Counterpart - Set bV5ImageSize if it was not already set - Probe bits we're given in NtGdiSetDIBits - SEHize clipboard image data access
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 11:36:20 2010 New Revision: 47733 URL: http://svn.reactos.org/svn/reactos?rev=47733&view=rev Log: [WIN32K] - Split NtGdiCreateDIBitmapInternal with its Gre Counterpart - Set bV5ImageSize if it was not already set - Probe bits we're given in NtGdiSetDIBits - SEHize clipboard image data access Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c 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] Thu Jun 10 11:36:20 2010 @@ -36,3 +36,15 @@ IN ULONG cjBits, IN OPTIONAL PVOID pvBits); +HBITMAP +FASTCALL +GreCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL PBITMAPV5INFO pbmi, + IN DWORD iUsage, + IN FLONG fl, + IN HANDLE hcmXform); Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Jun 10 11:36:20 2010 @@ -243,31 +243,45 @@ /*==============================================================*/ HANDLE FASTCALL -renderBITMAPfromDIB(LPBYTE hDIB) +renderBITMAPfromDIB(LPBYTE pDIB) { HDC hdc; HBITMAP hbitmap; unsigned int offset; - BITMAPINFOHEADER *ih; + BITMAPV5INFO bmi; + NTSTATUS Status ; //hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); hdc = UserGetDCEx(ClipboardWindow, NULL, DCX_USESTYLE); - ih = (BITMAPINFOHEADER *)hDIB; - - offset = sizeof(BITMAPINFOHEADER) + ((ih->biBitCount <= 8) ? (sizeof(RGBQUAD) * (1 << ih->biBitCount)) : 0); - - hbitmap = NtGdiCreateDIBitmapInternal(hdc, - ih->biWidth, - ih->biHeight, - CBM_INIT, - (LPBYTE)ih+offset, - (LPBITMAPINFO)ih, - DIB_RGB_COLORS, - ih->biBitCount, - ih->biSizeImage, - 0, - 0); + /* Probe it */ + _SEH2_TRY + { + Status = ProbeAndConvertToBitmapV5Info(&bmi, (BITMAPINFO*)pDIB, DIB_RGB_COLORS, 0); + offset = DIB_BitmapInfoSize((BITMAPINFO*)pDIB, DIB_RGB_COLORS); + ProbeForRead(pDIB + offset, bmi.bmiHeader.bV5SizeImage, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + UserReleaseDC(ClipboardWindow, hdc, FALSE); + return NULL; + } + + hbitmap = GreCreateDIBitmapInternal(hdc, + bmi.bmiHeader.bV5Width, + bmi.bmiHeader.bV5Height, + CBM_INIT, + pDIB+offset, + &bmi, + DIB_RGB_COLORS, + 0, + 0); //UserReleaseDC(NULL, hdc, FALSE); UserReleaseDC(ClipboardWindow, hdc, FALSE); 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] Thu Jun 10 11:36:20 2010 @@ -355,7 +355,7 @@ _SEH2_TRY { Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, 0); - /* Don't check Bits and hope we won't die */ + ProbeForRead(Bits, bmiLocal.bmiHeader.bV5SizeImage, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1130,28 +1130,53 @@ IN FLONG fl, IN HANDLE hcmXform) { + 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; + } + + return GreCreateDIBitmapInternal(hDc, + cx, + cy, + fInit, + pjInit, + pbmi ? &bmiLocal : NULL, + iUsage, + fl, + hcmXform); +} + +HBITMAP +FASTCALL +GreCreateDIBitmapInternal( + IN HDC hDc, + IN INT cx, + IN INT cy, + IN DWORD fInit, + IN OPTIONAL LPBYTE pjInit, + IN OPTIONAL PBITMAPV5INFO pbmi, + IN DWORD iUsage, + IN FLONG fl, + IN HANDLE hcmXform) +{ 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; - } + WORD bpp; if (!hDc) // CreateBitmap { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. @@ -1170,7 +1195,7 @@ return NULL; } bpp = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); @@ -1188,7 +1213,7 @@ should match that of the hdc and not that supplied in bmih. */ if (pbmi) - bpp = bmiLocal.bmiHeader.bV5BitCount; + bpp = pbmi->bmiHeader.bV5BitCount; else { if (Dc->dctype != DC_TYPE_MEMORY) @@ -1212,7 +1237,7 @@ } } } - Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi ? &bmiLocal : NULL, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); } return Bmp; @@ -1800,7 +1825,9 @@ /* Set some default values */ pbmhDst->bV5Compression = BI_RGB; - pbmhDst->bV5SizeImage = 0; + pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbch->bcWidth, + pbch->bcHeight, + pbch->bcPlanes*pbch->bcBitCount) ; pbmhDst->bV5XPelsPerMeter = 72; pbmhDst->bV5YPelsPerMeter = 72; pbmhDst->bV5ClrUsed = 0; @@ -1810,6 +1837,10 @@ { /* Copy valid fields */ memcpy(pbmiDst, pbmiUnsafe, dwSize); + if(!pbmhDst->bV5SizeImage) + pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbmhDst->bV5Width, + pbmhDst->bV5Height, + pbmhDst->bV5Planes*pbmhDst->bV5BitCount) ; if(dwSize < sizeof(BITMAPV5HEADER)) { @@ -1939,7 +1970,7 @@ else { /* Copy valid Fields, keep bmiHeader.biSize safe */ - RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, + RtlCopyMemory(&pbmiDst->bmiHeader.biWidth, &pbmiSrc->bmiHeader.bV5Width, pbmiDst->bmiHeader.biSize - sizeof(DWORD)); } @@ -1957,7 +1988,7 @@ ULONG cColorsUsed; cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; - if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) + if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); if(dwColorUse == DIB_PAL_COLORS)

1 0

[cgutman] 47732: [DHCPCSVC] - Implement adapter discovery after startup (currently does not work because the iphlpapi code is not implemented)
by cgutman＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: cgutman Date: Thu Jun 10 04:38:04 2010 New Revision: 47732 URL: http://svn.reactos.org/svn/reactos?rev=47732&view=rev Log: [DHCPCSVC] - Implement adapter discovery after startup (currently does not work because the iphlpapi code is not implemented) Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Thu Jun 10 04:38:04 2010 @@ -227,141 +227,168 @@ /* * XXX Figure out the way to bind a specific adapter to a socket. */ -BOOLEAN AdapterDiscover() { +DWORD WINAPI AdapterDiscoveryThread(LPVOID Unused) { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; struct interface_info *ifi = NULL; int i; - BOOLEAN ret = TRUE; - - DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); - - while( (Error = GetIfTable(Table, &Size, 0 )) == - ERROR_INSUFFICIENT_BUFFER ) { - DH_DbgPrint(MID_TRACE,("Error %d, New Buffer Size: %d\n", Error, Size)); - free( Table ); - Table = (PMIB_IFTABLE) malloc( Size ); - } - - if( Error != NO_ERROR ) { - ret = FALSE; - goto term; - } - - DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); - - for( i = Table->dwNumEntries - 1; i >= 0; i-- ) { - DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", - Table->table[i].dwIndex)); - - if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) - { - /* This is an existing adapter */ - if (InterfaceConnected(Table->table[i])) { - /* We're still active so we stay in the list */ - ifi = &Adapter->DhclientInfo; - } else { - /* We've lost our link so out we go */ - RemoveEntryList(&Adapter->ListEntry); - free(Adapter); + + /* FIXME: Kill this thread when the service is stopped */ + + do { + DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); + + while( (Error = GetIfTable(Table, &Size, 0 )) == + ERROR_INSUFFICIENT_BUFFER ) { + DH_DbgPrint(MID_TRACE,("Error %d, New Buffer Size: %d\n", Error, Size)); + free( Table ); + Table = (PMIB_IFTABLE) malloc( Size ); + } + + if( Error != NO_ERROR ) + break; + + DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); + + for( i = Table->dwNumEntries - 1; i >= 0; i-- ) { + DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", + Table->table[i].dwIndex)); + + ApiLock(); + + if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) + { + /* This is an existing adapter */ + if (InterfaceConnected(Table->table[i])) { + /* We're still active so we stay in the list */ + ifi = &Adapter->DhclientInfo; + } else { + /* We've lost our link so out we go */ + RemoveEntryList(&Adapter->ListEntry); + free(Adapter); + } + + ApiUnlock(); + + continue; } - continue; + ApiUnlock(); + + Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); + + if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET && InterfaceConnected(Table->table[i])) { + memcpy( &Adapter->IfMib, &Table->table[i], + sizeof(Adapter->IfMib) ); + Adapter->DhclientInfo.client = &Adapter->DhclientState; + Adapter->DhclientInfo.rbuf = Adapter->recv_buf; + Adapter->DhclientInfo.rbuf_max = Table->table[i].dwMtu; + Adapter->DhclientInfo.rbuf_len = + Adapter->DhclientInfo.rbuf_offset = 0; + memcpy(Adapter->DhclientInfo.hw_address.haddr, + Adapter->IfMib.bPhysAddr, + Adapter->IfMib.dwPhysAddrLen); + Adapter->DhclientInfo.hw_address.hlen = Adapter->IfMib.dwPhysAddrLen; + + /* I'm not sure where else to set this, but + some DHCP servers won't take a zero. + We checked the hardware type earlier in + the if statement. */ + Adapter->DhclientInfo.hw_address.htype = HTYPE_ETHER; + + if( DhcpSocket == INVALID_SOCKET ) { + DhcpSocket = + Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.wfdesc = + socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); + + if (DhcpSocket != INVALID_SOCKET) { + Adapter->ListenAddr.sin_family = AF_INET; + Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); + Adapter->BindStatus = + (bind( Adapter->DhclientInfo.rfdesc, + (struct sockaddr *)&Adapter->ListenAddr, + sizeof(Adapter->ListenAddr) ) == 0) ? + 0 : WSAGetLastError(); + } else { + error("socket() failed: %d\n", WSAGetLastError()); + } + } else { + Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.wfdesc = DhcpSocket; + } + + Adapter->DhclientConfig.timeout = DHCP_PANIC_TIMEOUT; + Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; + Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL; + Adapter->DhclientConfig.select_interval = 1; + Adapter->DhclientConfig.reboot_timeout = DHCP_REBOOT_TIMEOUT; + Adapter->DhclientConfig.backoff_cutoff = DHCP_BACKOFF_MAX; + Adapter->DhclientState.interval = + Adapter->DhclientConfig.retry_interval; + + if( PrepareAdapterForService( Adapter ) ) { + Adapter->DhclientInfo.next = ifi; + ifi = &Adapter->DhclientInfo; + + read_client_conf(&Adapter->DhclientInfo); + + if (Adapter->DhclientInfo.client->state == S_INIT) + { + add_protocol(Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, + got_one, &Adapter->DhclientInfo); + + state_init(&Adapter->DhclientInfo); + } + + ApiLock(); + InsertTailList( &AdapterList, &Adapter->ListEntry ); + ApiUnlock(); + } else { free( Adapter ); Adapter = 0; } + } else { free( Adapter ); Adapter = 0; } + + if( !Adapter ) + DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", + Table->table[i].dwIndex)); } - - Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); - - if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET && InterfaceConnected(Table->table[i])) { - memcpy( &Adapter->IfMib, &Table->table[i], - sizeof(Adapter->IfMib) ); - Adapter->DhclientInfo.client = &Adapter->DhclientState; - Adapter->DhclientInfo.rbuf = Adapter->recv_buf; - Adapter->DhclientInfo.rbuf_max = Table->table[i].dwMtu; - Adapter->DhclientInfo.rbuf_len = - Adapter->DhclientInfo.rbuf_offset = 0; - memcpy(Adapter->DhclientInfo.hw_address.haddr, - Adapter->IfMib.bPhysAddr, - Adapter->IfMib.dwPhysAddrLen); - Adapter->DhclientInfo.hw_address.hlen = - Adapter->IfMib.dwPhysAddrLen; - /* I'm not sure where else to set this, but - some DHCP servers won't take a zero. - We checked the hardware type earlier in - the if statement. */ - Adapter->DhclientInfo.hw_address.htype = - HTYPE_ETHER; - - if( DhcpSocket == INVALID_SOCKET ) { - DhcpSocket = - Adapter->DhclientInfo.rfdesc = - Adapter->DhclientInfo.wfdesc = - socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); - - if (DhcpSocket != INVALID_SOCKET) { - Adapter->ListenAddr.sin_family = AF_INET; - Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); - Adapter->BindStatus = - (bind( Adapter->DhclientInfo.rfdesc, - (struct sockaddr *)&Adapter->ListenAddr, - sizeof(Adapter->ListenAddr) ) == 0) ? - 0 : WSAGetLastError(); - } else { - error("socket() failed: %d\n", WSAGetLastError()); - } - } else { - Adapter->DhclientInfo.rfdesc = - Adapter->DhclientInfo.wfdesc = DhcpSocket; - } - - Adapter->DhclientConfig.timeout = DHCP_PANIC_TIMEOUT; - Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; - Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL; - Adapter->DhclientConfig.select_interval = 1; - Adapter->DhclientConfig.reboot_timeout = DHCP_REBOOT_TIMEOUT; - Adapter->DhclientConfig.backoff_cutoff = DHCP_BACKOFF_MAX; - Adapter->DhclientState.interval = - Adapter->DhclientConfig.retry_interval; - - if( PrepareAdapterForService( Adapter ) ) { - Adapter->DhclientInfo.next = ifi; - ifi = &Adapter->DhclientInfo; - - read_client_conf(&Adapter->DhclientInfo); - - if (Adapter->DhclientInfo.client->state == S_INIT) - { - add_protocol(Adapter->DhclientInfo.name, - Adapter->DhclientInfo.rfdesc, - got_one, &Adapter->DhclientInfo); - - state_init(&Adapter->DhclientInfo); - } - - InsertTailList( &AdapterList, &Adapter->ListEntry ); - } else { free( Adapter ); Adapter = 0; } - } else { free( Adapter ); Adapter = 0; } - - if( !Adapter ) - DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", - Table->table[i].dwIndex)); - } - - DH_DbgPrint(MID_TRACE,("done with AdapterInit\n")); - -term: + } while ((Error = NotifyAddrChange(NULL, NULL)) == NO_ERROR); + + DbgPrint("DHCPCSVC: Adapter discovery thread is terminating! (Error: %d)\n", Error); + if( Table ) free( Table ); - return ret; + return Error; +} + +BOOLEAN StartAdapterDiscovery(VOID) { + HANDLE ThreadHandle; + + ThreadHandle = CreateThread(NULL, + 0, + AdapterDiscoveryThread, + NULL, + 0, + NULL); + + if (ThreadHandle == NULL) + return FALSE; + + CloseHandle(ThreadHandle); + + return TRUE; } void AdapterStop() { PLIST_ENTRY ListEntry; PDHCP_ADAPTER Adapter; + ApiLock(); while( !IsListEmpty( &AdapterList ) ) { ListEntry = (PLIST_ENTRY)RemoveHeadList( &AdapterList ); Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); free( Adapter ); } + ApiUnlock(); WSACleanup(); } Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/di… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Thu Jun 10 04:38:04 2010 @@ -69,7 +69,7 @@ time_t howlong, cur_time; struct timeval timeval; - if (!AdapterDiscover()) + if (!StartAdapterDiscovery()) return; ApiLock(); Modified: trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/include… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] Thu Jun 10 04:38:04 2010 @@ -77,7 +77,7 @@ #define srandom srand void AdapterInit(VOID); -BOOLEAN AdapterDiscover(VOID); +BOOLEAN StartAdapterDiscovery(VOID); void AdapterStop(VOID); extern PDHCP_ADAPTER AdapterGetFirst(); extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);

1 0

[jgardou] 47731: [WIN32K] - check for the type of the DC to restore to decide whether we should restore the surface Fixes yarotows specific FF3 bug
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 00:40:09 2010 New Revision: 47731 URL: http://svn.reactos.org/svn/reactos?rev=47731&view=rev Log: [WIN32K] - check for the type of the DC to restore to decide whether we should restore the surface Fixes yarotows specific FF3 bug Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Thu Jun 10 00:40:09 2010 @@ -149,7 +149,7 @@ DC_vCopyState(pdcSave, pdc, FALSE); /* Only memory DC's change their surface */ - if (pdcSave->dctype == DCTYPE_MEMORY) + if (pdc->dctype == DCTYPE_MEMORY) DC_vSelectSurface(pdc, pdcSave->dclevel.pSurface); // Restore Path by removing it, if the Save flag is set.

1 0

[jgardou] 47730: [ROSTESTS] test what happens when a DC is saved and a bitmap is selected into it.
by jgardou＠svn.reactos.org 10 Jun '10

10 Jun '10

Author: jgardou Date: Thu Jun 10 00:17:06 2010 New Revision: 47730 URL: http://svn.reactos.org/svn/reactos?rev=47730&view=rev Log: [ROSTESTS] test what happens when a DC is saved and a bitmap is selected into it. Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSaveDC.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSaveDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSaveDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSaveDC.c [iso-8859-1] Thu Jun 10 00:17:06 2010 @@ -2,8 +2,9 @@ INT Test_NtGdiSaveDC(PTESTINFO pti) { - HDC hdc; + HDC hdc, hdc2; HWND hwnd; + HBITMAP hbmp1, hbmp2, hOldBmp; /* Test 0 hdc */ TEST(NtGdiSaveDC(0) == 0); @@ -39,6 +40,38 @@ NtGdiRestoreDC(hdc, 1); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); + + /* test behaviour when a bitmap is selected */ + hbmp1 = CreateBitmap(2, 2, 1, 1, NULL); + TEST(hbmp1); + hbmp2 = CreateBitmap(2, 2, 1, 1, NULL); + TEST(hbmp2); + hdc = CreateCompatibleDC(0); + TEST(hdc); + hdc2 = CreateCompatibleDC(0); + TEST(hdc2); + hOldBmp = SelectObject(hdc, hbmp1); + TEST(hOldBmp); + TEST(NtGdiSaveDC(hdc) == 1); + TEST(SelectObject(hdc, hbmp2) == hbmp1); + TEST(SelectObject(hdc2, hbmp1) == NULL); + SelectObject(hdc, hOldBmp); + NtGdiRestoreDC(hdc, 1); + TEST(GetCurrentObject(hdc, OBJ_BITMAP) == hbmp1); + /* Again, just to be sure */ + TEST(NtGdiSaveDC(hdc) == 1); + TEST(NtGdiSaveDC(hdc) == 2); + TEST(SelectObject(hdc, hbmp2) == hbmp1); + TEST(SelectObject(hdc2, hbmp1) == NULL); + SelectObject(hdc, hOldBmp); + NtGdiRestoreDC(hdc, 2); + TEST(GetCurrentObject(hdc, OBJ_BITMAP) == hbmp1); + /*Cleanup */ + SelectObject(hdc, hOldBmp); + DeleteDC(hdc); + DeleteDC(hdc2); + DeleteObject(hbmp1); + DeleteObject(hbmp2); return APISTATUS_NORMAL; }

1 0

[cgutman] 47729: [ACPI] - Create a resource list for the PCI root bus (even though it doesn't use any resources according to ACPI) and fill it with a bus number resource descriptor - Fixes PCI device detection with ACPI enabled
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 23:02:34 2010 New Revision: 47729 URL: http://svn.reactos.org/svn/reactos?rev=47729&view=rev Log: [ACPI] - Create a resource list for the PCI root bus (even though it doesn't use any resources according to ACPI) and fill it with a bus number resource descriptor - Fixes PCI device detection with ACPI enabled Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Wed Jun 9 23:02:34 2010 @@ -644,6 +644,37 @@ ACPI_RESOURCE* resource; ULONG ResourceListSize; ULONG i; + ULONGLONG BusNumber; + + /* A bus number resource is not included in the list of current resources + * for the root PCI bus so we manually query one here and if we find it + * we create a resource list and add a bus number descriptor to it */ + AcpiStatus = acpi_evaluate_integer(DeviceData->AcpiHandle, "_BBN", NULL, &BusNumber); + if (AcpiStatus == AE_OK) + { + DPRINT1("Found PCI root hub: %d\n", BusNumber); + + ResourceListSize = sizeof(CM_RESOURCE_LIST); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, ResourceListSize); + if (!ResourceList) + return STATUS_INSUFFICIENT_RESOURCES; + + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Internal; + ResourceList->List[0].BusNumber = 0; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 1; + ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; + + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->u.BusNumber.Start = BusNumber; + ResourceDescriptor->u.BusNumber.Length = 1; + + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + return STATUS_SUCCESS; + } /* Get current resources */ Buffer.Length = 0;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs