Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37442: - Declare SECURITY_DESCRIPTOR_CONTROL conditionally

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 18 11:05:49 2008 New Revision: 37442 URL: http://svn.reactos.org/svn/reactos?rev=37442&view=rev Log: - Declare SECURITY_DESCRIPTOR_CONTROL conditionally Modified: trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Tue Nov 18 11:05:49 2008 @@ -30,7 +30,9 @@ [size_is(AclSize - 4)] BYTE Dummy1[*]; } LSAPR_ACL, *PLSAPR_ACL; +cpp_quote("#ifndef _WINNT_H") typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; +cpp_quote("#endif") typedef struct _LSAPR_SECURITY_DESCRIPTOR { BYTE Revision;

15 years, 10 months

[sginsberg] 37441: - Remove system_header from gdiplus*.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 18 10:56:22 2008 New Revision: 37441 URL: http://svn.reactos.org/svn/reactos?rev=37441&view=rev Log: - Remove system_header from gdiplus*.h Modified: trunk/reactos/include/psdk/gdiplusbase.h trunk/reactos/include/psdk/gdiplusbrush.h trunk/reactos/include/psdk/gdipluseffects.h trunk/reactos/include/psdk/gdiplusgraphics.h trunk/reactos/include/psdk/gdiplusheaders.h trunk/reactos/include/psdk/gdiplusimageattributes.h trunk/reactos/include/psdk/gdipluslinecaps.h trunk/reactos/include/psdk/gdiplusmatrix.h trunk/reactos/include/psdk/gdiplusmetafile.h trunk/reactos/include/psdk/gdipluspath.h trunk/reactos/include/psdk/gdipluspen.h trunk/reactos/include/psdk/gdiplusstringformat.h Modified: trunk/reactos/include/psdk/gdiplusbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusbase.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusbase.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSBASE_H #define _GDIPLUSBASE_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class GdiplusBase { public: Modified: trunk/reactos/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusbrush.… ============================================================================== --- trunk/reactos/include/psdk/gdiplusbrush.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusbrush.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -19,10 +19,6 @@ #ifndef _GDIPLUSBRUSH_H #define _GDIPLUSBRUSH_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - class Brush : public GdiplusBase { public: Modified: trunk/reactos/include/psdk/gdipluseffects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluseffect… ============================================================================== --- trunk/reactos/include/psdk/gdipluseffects.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluseffects.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -19,10 +19,6 @@ #ifndef _GDIPLUSEFFECTS_H #define _GDIPLUSEFFECTS_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - typedef struct { float radius; BOOL expandEdge; Modified: trunk/reactos/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusgraphi… ============================================================================== --- trunk/reactos/include/psdk/gdiplusgraphics.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusgraphics.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -19,10 +19,6 @@ #ifndef _GDIPLUSGRAPHICS_H #define _GDIPLUSGRAPHICS_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - class Graphics : public GdiplusBase { public: Modified: trunk/reactos/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusheader… ============================================================================== --- trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusheaders.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -19,10 +19,6 @@ #ifndef _GDIPLUSHEADERS_H #define _GDIPLUSHEADERS_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - class Image : public GdiplusBase { public: Modified: trunk/reactos/include/psdk/gdiplusimageattributes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusimagea… ============================================================================== --- trunk/reactos/include/psdk/gdiplusimageattributes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusimageattributes.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSIMAGEATTRIBUTES_H #define _GDIPLUSIMAGEATTRIBUTES_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class ImageAttributes : public GdiplusBase { Modified: trunk/reactos/include/psdk/gdipluslinecaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluslineca… ============================================================================== --- trunk/reactos/include/psdk/gdipluslinecaps.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluslinecaps.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSLINECAPS_H #define _GDIPLUSLINECAPS_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif inline CustomLineCap::CustomLineCap(const GraphicsPath *fillPath, Modified: trunk/reactos/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusmatrix… ============================================================================== --- trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusmatrix.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSMATRIX_H #define _GDIPLUSMATRIX_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class Matrix : public GdiplusBase { Modified: trunk/reactos/include/psdk/gdiplusmetafile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusmetafi… ============================================================================== --- trunk/reactos/include/psdk/gdiplusmetafile.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusmetafile.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSMETAFILE_H #define _GDIPLUSMETAFILE_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class Metafile : public Image { Modified: trunk/reactos/include/psdk/gdipluspath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluspath.h… ============================================================================== --- trunk/reactos/include/psdk/gdipluspath.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluspath.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -19,10 +19,6 @@ #ifndef _GDIPLUSPATH_H #define _GDIPLUSPATH_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - class GraphicsPath : public GdiplusBase { public: Modified: trunk/reactos/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluspen.h?… ============================================================================== --- trunk/reactos/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluspen.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSPEN_H #define _GDIPLUSPEN_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class Pen : public GdiplusBase { Modified: trunk/reactos/include/psdk/gdiplusstringformat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusstring… ============================================================================== --- trunk/reactos/include/psdk/gdiplusstringformat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusstringformat.h [iso-8859-1] Tue Nov 18 10:56:22 2008 @@ -18,10 +18,6 @@ #ifndef _GDIPLUSSTRINGFORMAT_H #define _GDIPLUSSTRINGFORMAT_H - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif class StringFormat : public GdiplusBase {

15 years, 10 months

[sginsberg] 37440: - Remove system_header from winbase.h, wingdi.h and winuser.h - Remove duplicate define from Wine's winuser.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Nov 18 10:15:37 2008 New Revision: 37440 URL: http://svn.reactos.org/svn/reactos?rev=37440&view=rev Log: - Remove system_header from winbase.h, wingdi.h and winuser.h - Remove duplicate define from Wine's winuser.h Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Tue Nov 18 10:15:37 2008 @@ -1,8 +1,5 @@ #ifndef _WINBASE_ #define _WINBASE_ -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #if !defined(_KERNEL32_) #define WINBASEAPI DECLSPEC_IMPORT Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Nov 18 10:15:37 2008 @@ -1,9 +1,6 @@ #ifndef _WINGDI_H #define _WINGDI_H #define _WINGDI_ -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Nov 18 10:15:37 2008 @@ -1,8 +1,5 @@ #ifndef _WINUSER_H #define _WINUSER_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Tue Nov 18 10:15:37 2008 @@ -18,8 +18,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); - -typedef struct tagCWPSTRUCT *LPCWPSTRUCT; #define WM_ALTTABACTIVE 0x0029

15 years, 10 months

[jimtabor] 37439: - Make our version of SetDIBits safe as SetDIBitsToDevice.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 18 10:07:54 2008 New Revision: 37439 URL: http://svn.reactos.org/svn/reactos?rev=37439&view=rev Log: - Make our version of SetDIBits safe as SetDIBitsToDevice. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Tue Nov 18 10:07:54 2008 @@ -585,7 +585,11 @@ CONST BITMAPINFO *lpbmi, UINT fuColorUse) { + PBITMAPINFO pConvertedInfo; + UINT ConvertedInfoSize; INT LinesCopied = 0; + UINT cjBmpScanSize = 0; + PVOID pvSafeBits = (PVOID)lpvBits; // This needs to be almost the sames as SetDIBitsToDevice @@ -594,15 +598,33 @@ if ( fuColorUse && fuColorUse != DIB_PAL_COLORS && fuColorUse != DIB_PAL_COLORS+1 ) return 0; + + pConvertedInfo = ConvertBitmapInfo(lpbmi, fuColorUse, + &ConvertedInfoSize, FALSE); + if (!pConvertedInfo) + return 0; + + cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, cScanLines); + + if ( lpvBits ) + { + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + RtlCopyMemory( pvSafeBits, lpvBits, cjBmpScanSize); + } LinesCopied = NtGdiSetDIBits( hdc, hbmp, uStartScan, cScanLines, - lpvBits, - lpbmi, + pvSafeBits, + pConvertedInfo, fuColorUse); + if ( lpvBits != pvSafeBits) + RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); + if (lpbmi != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); return LinesCopied; } @@ -725,7 +747,7 @@ TRUE, NULL); } - if ( Bits ) + if ( Bits != pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpbmi != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo);

15 years, 10 months

[dreimer] 37438: Mooore tidy up work, some optimizations and removal of external functions by internal ones. raddr2line almost works. makex works.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 18 09:16:16 2008 New Revision: 37438 URL: http://svn.reactos.org/svn/reactos?rev=37438&view=rev Log: Mooore tidy up work, some optimizations and removal of external functions by internal ones. raddr2line almost works. makex works. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -42,7 +42,7 @@ # Small Security Check to prevent useless apps. if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") { if ($ENV:ROS_BUILDNOSTRIP -eq "yes") { - cls + clear-host "Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them." exit } @@ -170,7 +170,7 @@ function BUILDMULTI { # # Get the number of CPUs in the system so we know how many jobs to execute. - $CPUCOUNT= (gwmi win32_processor).numberofcores + 1 + $CPUCOUNT = (gwmi win32_processor).numberofcores + 1 if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw; @@ -204,15 +204,12 @@ # # Check if we are using -j or not. # -if ($args.count -gt 1) { - if ($args[0] -eq "multi") { - $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW $ENV:ROS_ARCH" - } +if ($args[0] -eq "multi") { + $args.setvalue($null, 0) + $host.ui.RawUI.WindowTitle = "''makex $($args)'' parallel build started: $TIMERAW $ENV:ROS_ARCH" BUILDMULTI $args } else { - if ($args.count -gt 0) { - $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW $ENV:ROS_ARCH" - } + $host.ui.RawUI.WindowTitle = "''make $($args)'' build started: $TIMERAW $ENV:ROS_ARCH" BUILD $args } @@ -230,6 +227,7 @@ # $ENV:ROS_BUILDNOSTRIP = $null $ENV:ROS_LEAN_AND_MEAN = $null +$ENV:CCACHE_DIR = $null $ENV:HOST_CC = $null $ENV:HOST_CPP = $null $ENV:TARGET_CC = $null @@ -237,7 +235,8 @@ $ENV:ROS_INTERMEDIATE = $null $ENV:ROS_OUTPUT = $null $ENV:ROS_TEMPORARY = $null -$ENV:CPUCOUNT = $null -$ENV:CCACHE_DIR = $null -$ENV:ROSA_DEL = $null -$ENV:ROSB_DEL = $null +$TIMERAW = $null +$DATENAME = $null +$TIMENAME = $null +$CPUCOUNT = $null +$sw = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -47,7 +47,7 @@ "ERROR: There is no compiler output to clean." } } - if ($ENV:ROS_ARCH -eq "ppc") { + elseif ($ENV:ROS_ARCH -eq "ppc") { if (Test-Path ".\obj-ppc") { "Cleaning ReactOS PPC source directory..." # @@ -67,7 +67,7 @@ "ERROR: There is no compiler output to clean." } } - if ($ENV:ROS_ARCH -eq "amd64") { + elseif ($ENV:ROS_ARCH -eq "amd64") { if (Test-Path ".\obj-amd64") { "Cleaning ReactOS x86_64 source directory..." # @@ -87,7 +87,7 @@ "ERROR: There is no compiler output to clean." } } - if ($ENV:ROS_ARCH -eq $null) { + elseif ($ENV:ROS_ARCH -eq $null) { if (Test-Path ".\obj-i386") { "Cleaning ReactOS i386 source directory..." # @@ -121,16 +121,16 @@ rembin end } -if ("$args" -eq "logs") { +elseif ("$args" -eq "logs") { remlog end } -if ("$args" -eq "all") { +elseif ("$args" -eq "all") { rembin remlog end } -if ("$args" -ne "") { +elseif ("$args" -ne "") { "Unknown parameter specified. Try ''help [COMMAND]''." end } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -25,13 +25,13 @@ $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { if (Test-Path ".\config.rbuild") { - del ".\config.rbuild" + remove-item ".\config.rbuild" "Main Configuration File was found and deleted." } else { "Main Configuration File was not found in ReactOS Source Tree." } if (Test-Path "$ENV:APPDATA\RosBE\config.rbuild") { - del "$ENV:APPDATA\RosBE\config.rbuild" + remove-item "$ENV:APPDATA\RosBE\config.rbuild" "Working Configuration File was found and deleted." } else { "Working Configuration File was not found in ReactOS Source Tree." @@ -45,9 +45,9 @@ "Continue?" $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { - del "$_ROSBE_BASEDIR\*.rbuild" - del ".\config.rbuild" - copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" + remove-item "$_ROSBE_BASEDIR\*.rbuild" + remove-item ".\config.rbuild" + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" "Successfully Updated." } settitle @@ -61,7 +61,7 @@ # Check if config.rbuild already exists. If not, get a working copy. # if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { - copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" } # @@ -76,7 +76,7 @@ $YESNO = Read-Host "(yes), (no)" -if ($YESNO -eq "no") {settitle} +if ($YESNO -ne "yes") {settitle} # # Check if config.template.rbuild is newer than config.rbuild, if it is then @@ -91,15 +91,15 @@ "*** previously made settings. ***" "" $YESNO = Read-Host "(yes), (no)" - if ($YESNO -eq "yes") {del "$ENV:APPDATA\RosBE\*.rbuild" | del ".\config.rbuild" | copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} - if ($YESNO -eq "no") {settitle} + if ($YESNO -eq "yes") {remove-item "$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} + else {settitle} } } # # Prepare XML Parser. # -[xml] $XML = type "$ENV:APPDATA\RosBE\config.rbuild" +[xml] $XML = get-content "$ENV:APPDATA\RosBE\config.rbuild" # # Start with reading settings from config.rbuild and let the user edit them. @@ -110,7 +110,7 @@ $SARCH = $xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value} "Right now: $SARCH" $SARCH_CH = Read-Host "(), (xbox)" -cls +clear-host "Which CPU ReactOS should be optimized for." "" @@ -129,7 +129,7 @@ if ($OARCH_CH -eq $null) { $OARCH_CH = $OARCH } -cls +clear-host "What level do you want ReactOS to be optimized at." "This setting does not work if GDB is set." @@ -144,7 +144,7 @@ if ($OPTIMIZE_CH -eq $null) { $OPTIMIZE_CH = $OPTIMIZE } -cls +clear-host "Whether to compile in the integrated kernel debugger." "Default is: 1" @@ -155,7 +155,7 @@ if ($KDBG_CH -eq $null) { $KDBG_CH = $KDBG } -cls +clear-host "Whether to compile for debugging. No compiler optimizations will be" "performed." @@ -167,7 +167,7 @@ if ($KDBG_CH -eq $null) { $DBG_CH = $DBG } -cls +clear-host "Whether to compile for debugging with GDB. If you don't use GDB," "don't enable this." @@ -179,7 +179,7 @@ if ($GDB_CH -eq $null) { $GDB_CH = $GDB } -cls +clear-host "Whether to compile apps/libs with features covered software patents" "or not. If you live in a country where software patents are" @@ -193,7 +193,7 @@ if ($NSWPAT_CH -eq $null) { $NSWPAT_CH = $NSWPAT } -cls +clear-host "Whether to compile with the KD protocol. This will disable support for" "KDBG as well as rossym and symbol lookups, and allow WinDBG to connect" @@ -209,7 +209,7 @@ if ($WINKD_CH -eq $null) { $WINKD_CH = $WINKD } -cls +clear-host "Whether to compile support for ELF files. Do not enable unless you know what" "you're doing." @@ -221,7 +221,7 @@ if ($ELF_CH -eq $null) { $ELF_CH = $ELF } -cls +clear-host # # Generate a config.rbuild, copy it to the Source Tree and delete temp files. @@ -236,7 +236,7 @@ $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value = "$ELF_CH"} $xml.save("$ENV:APPDATA\RosBE\config.rbuild") -copy "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" +copy-item "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" if ($_ROSBE_VERSION -ne $null) { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -15,7 +15,7 @@ (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" -cls +clear-host $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) @@ -32,13 +32,13 @@ # # Get the number of CPUs in the system so we know how many jobs to execute. -$CPUCOUNT= (gwmi win32_processor).numberofcores + 1 +$CPUCOUNT = (gwmi win32_processor).numberofcores + 1 if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global } set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global -set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global +function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi"} if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -13,7 +13,7 @@ # (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" -cls +clear-host if ($ENV:APPDATA.Length -lt 1) { $ENV:APPDATA = $ENV:USERPROFILE @@ -62,7 +62,7 @@ function LoadAliases { function global:BASEDIR { - cd "$_ROSBE_ROSSOURCEDIR" + set-location "$_ROSBE_ROSSOURCEDIR" } if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global @@ -84,7 +84,7 @@ set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global - set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global + function global:MAKEX($xargs) {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $($xargs)"} if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global @@ -129,23 +129,23 @@ # if ($args.count -gt 0) { if ($args -eq "oldmode") { - cls + clear-host $_ROSBE_MODE = "MinGW" } elseif ($args -eq "arm") { - cls + clear-host $_ROSBE_ARCH = 1 } elseif ($args -eq "ppc") { - cls + clear-host $_ROSBE_ARCH = 2 } elseif ($args -eq "amd64") { - cls + clear-host $_ROSBE_ARCH = 3 } elseif ($args -ne $null) { - cls + clear-host "Unknown parameter specified. Exiting." exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -26,13 +26,13 @@ $_1 = $args } if ($_1 -eq "previous") { - popd + pop-location } else { if (!(Test-Path "$_1\.")) { "ERROR: The path specified doesn't seem to exist." } - pushd "$_1" + push-location "$_1" } $global:_ROSBE_ROSSOURCEDIR = "$pwd" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -17,39 +17,30 @@ # sub-directories. # function CHECKPATH { - IEX "$ '&_ROSBE_BASEDIR\Tools\chkslash.exe' $_1" - if (errorlevel -eq 2) { - $_1 = dir /a:-d /s /b $_1 2>NUL | findstr "$_1" - } -} - -# -# If Parameters were set, parse them, if not, ask the user to add them. -# -function INTERACTIVE { - if ($_1 -eq $null) { - $_1 = Read-Host "Please enter the path/file to be examined: " - CHECKPATH - } - if ($_2 -eq $null) { - $_2 = Read-Host "Please enter the address you would like to analyze: " + if ($_1.Contains("\")) { + $_1 = get-childitem "$_1\*" -name -recurse 2>NUL | select-string "$_1" } } # # Receive the Parameters and decide what to do. # -if ($args[2] -ne $null) { +$_1 = $args[0] +$_2 = $args[1] +if ($args.length -bt 2) { "ERROR: Too many parameters specified." } -elseif ($args[0] -ne $null) { - $_1 = $args[0] - CHECKPATH +elseif ($args.length -lt 1) { + if ($_1 -eq $null) { + $_1 = Read-Host "Please enter the path/file to be examined: " + CHECKPATH + } } -elseif ($args[1] -ne $null) { - $_2 = $args[1] +elseif ($args.length -lt 2) { + if ($_2 -eq $null) { + $_2 = Read-Host "Please enter the address you would like to analyze: " + } } -INTERACTIVE # # First get the ImageBase of the File. If its smaller than the given @@ -63,12 +54,12 @@ if ($_2 -eq $null) { "ERROR: You must specify a address to analyze." } -$baseaddr = objdump -p $_1 2>NUL | findstr ImageBase -if ($i -lt $_2) { +$baseaddr = (objdump -p $_1 2>NUL | select-string "ImageBase") +if ($baseaddr -lt $_2) { IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$_2'" } else { - set /a baseaddr+=0x$_2 - $relbase = IEX "'$_ROSBE_BASEDIR\Tools\echoh.exe' $baseaddr" + $baseaddr = $baseaddr + 0x$_2 + $relbase = "{0:X}" -f $baseaddr IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$relbase'" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -47,20 +47,18 @@ $ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" if ($ENV:ROS_ARCH -ne $null) { - & "$ENV:ROS_PREFIX-gcc" -v 2> v.txt - $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' - rm v.txt + & "$ENV:ROS_PREFIX-gcc" -v 2> gcctvers.tmp + $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' } else { - gcc -v 2> v.txt - $global:_ROSBE_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' - rm v.txt + gcc -v 2> gcctvers.tmp + $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' } -gcc -v 2> v.txt -$global:_ROSBE_HOST_GCCVERSION = (select-string -path .\v.txt "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\v.txt "target=") -replace ".*--target=(.+?)\b.*",'$1' -rm v.txt +gcc -v 2> gcchvers.tmp +$global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' +remove-item gcchvers.tmp if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" @@ -75,17 +73,14 @@ # # Display the current version of GCC, NASM, ld and make. # + +(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' +"gcc target - $_ROSBE_GCCTARGET" +remove-item gcctvers.tmp + if ($ENV:ROS_ARCH -ne $null) { - & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2> v.txt - (select-string -path .\v.txt "gcc version") -replace ".*: (.+?)\b",'$1' - rm v.txt - "gcc target - $_ROSBE_GCCTARGET" & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v } else { - gcc -v 2> v.txt - (select-string -path .\v.txt "gcc version" ) -replace ".*: (.+?)\b",'$1' - rm v.txt - "gcc target - $_ROSBE_GCCTARGET" & ld -v } if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -59,7 +59,7 @@ if (Test-Path ".svn\.") { "ERROR: Folder already contains a repository." } else { - $dir = dir + $dir = get-childitem if ($dir -eq $null) { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." } else { @@ -76,8 +76,8 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | findstr "Revision:" - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | findstr "Revision:" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" UP } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Tue Nov 18 09:16:16 2008 @@ -18,7 +18,7 @@ if ($OUT -ne "Default") { if (Test-Path "$OUT\.") { - cd $OUT + set-location $OUT $_ROSBE_ROSSOURCEDIR = $OUT } }

15 years, 10 months

[jimtabor] 37437: - Fix bpp count in CreateDIBitmap.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 18 08:51:14 2008 New Revision: 37437 URL: http://svn.reactos.org/svn/reactos?rev=37437&view=rev Log: - Fix bpp count in CreateDIBitmap. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Nov 18 08:51:14 2008 @@ -1013,7 +1013,7 @@ HBITMAP Bmp; UINT bpp; - if (!hDc) + if (!hDc) // CreateBitmap { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); if (!hDc) @@ -1029,13 +1029,13 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return NULL; } - bpp = IntGdiGetDeviceCaps(Dc, BITSPIXEL); + bpp = 1; Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); } - else + else // CreateCompatibleBitmap { Dc = DC_LockDc(hDc); if (!Dc) @@ -1050,8 +1050,29 @@ if (pbmi) bpp = pbmi->bmiHeader.biBitCount; else - bpp = IntGdiGetDeviceCaps(Dc, BITSPIXEL); - + { + if (Dc->DC_Type != DC_TYPE_MEMORY ) + bpp = IntGdiGetDeviceCaps(Dc, BITSPIXEL); + else + { + DIBSECTION dibs; + INT Count; + BITMAPOBJ *BitmapObject = BITMAPOBJ_LockBitmap(Dc->w.hBitmap); + Count = BITMAP_GetObject(BitmapObject, 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; + } + BITMAPOBJ_UnlockBitmap(BitmapObject); + } + } Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); }

15 years, 10 months

[tkreuzer] 37431: forgot this file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 17 20:27:04 2008 New Revision: 37431 URL: http://svn.reactos.org/svn/reactos?rev=37431&view=rev Log: forgot this file Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/interrupt.c (with props) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/interrupt.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/interrupt.c [iso-8859-1] Mon Nov 17 20:27:04 2008 @@ -1,0 +1,62 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/irq.c + * PURPOSE: Manages the Kernel's IRQ support for external drivers, + * for the purpopses of connecting, disconnecting and setting + * up ISRs for drivers. The backend behind the Io* Interrupt + * routines. + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)web.de) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + + + +BOOLEAN +NTAPI +KeDisableInterrupts(VOID) +{ + ULONG64 Flags; + + /* Get the flags */ + Flags = __readeflags(); + + /* Disable interrupts */ + _disable(); + + return !!(Flags & EFLAGS_INTERRUPT_MASK); +} + + +BOOLEAN +NTAPI +KeDisconnectInterrupt(IN PKINTERRUPT Interrupt) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +NTAPI +KeInitializeInterrupt(IN PKINTERRUPT Interrupt, + IN PKSERVICE_ROUTINE ServiceRoutine, + IN PVOID ServiceContext, + IN PKSPIN_LOCK SpinLock, + IN ULONG Vector, + IN KIRQL Irql, + IN KIRQL SynchronizeIrql, + IN KINTERRUPT_MODE InterruptMode, + IN BOOLEAN ShareVector, + IN CHAR ProcessorNumber, + IN BOOLEAN FloatingSave) +{ + UNIMPLEMENTED; +} + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/interrupt.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[jimtabor] 37436: - Fixes bug 3864. While I was at it I fixed most of the gdi max bit max info sizes too. - Added notes for the SEH abuse in win32k dibobj.c. - Tested WinMerge 2.10.2, AbiWord 2.4.1, Firefox 1.5.0.3 and wine gdi32 bitmap cross test. - When testing with gdi cross test in 24 and 32 bit display mode, we have a pixel conversion mismatch. Please fix it!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 17 23:36:19 2008 New Revision: 37436 URL: http://svn.reactos.org/svn/reactos?rev=37436&view=rev Log: - Fixes bug 3864. While I was at it I fixed most of the gdi max bit max info sizes too. - Added notes for the SEH abuse in win32k dibobj.c. - Tested WinMerge 2.10.2, AbiWord 2.4.1, Firefox 1.5.0.3 and wine gdi32 bitmap cross test. - When testing with gdi cross test in 24 and 32 bit display mode, we have a pixel conversion mismatch. Please fix it! Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/utils.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -231,6 +231,7 @@ GdiSetLastError( DWORD dwErrCode ); DWORD STDCALL GdiGetCodePage(HDC); +UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO ); /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -1789,28 +1789,6 @@ /* * @unimplemented */ -HBITMAP STDCALL -CreateBitmap(INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - PCVOID pUnsafeBits) -{ - /* FIXME some part should be done in user mode */ - if (Width && Height) - { - return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); - } - else - { - /* Return 1x1 bitmap */ - return GetStockObject(DEFAULT_BITMAP); - } -} - -/* - * @unimplemented - */ ULONG STDCALL XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color) Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -6,13 +6,15 @@ /* * Return the full scan size for a bitmap. * - * Based on Wine, Utils.c and Windows Graphics Prog pg 595 + * Based on Wine, Utils.c and Windows Graphics Prog pg 595, SDK amvideo.h. */ UINT FASTCALL DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) { UINT MaxBits = 0; + + if (!Info) return 0; if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -30,6 +32,33 @@ return (MaxBits * ScanLines); // ret the full Size. } +UINT +FASTCALL +DIB_BitmapBitsSize( PBITMAPINFO Info ) +{ + UINT Ret; + + if (!Info) return 0; + + if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; + Ret = Core->bcHeight * + ((Core->bcWidth * Core->bcPlanes * Core->bcBitCount + 31) & ~31 ) / 8; + } + else /* assume BITMAPINFOHEADER */ + { + if ((Info->bmiHeader.biCompression) && + (Info->bmiHeader.biCompression != BI_BITFIELDS)) + return Info->bmiHeader.biSizeImage; + // Make Height positive always.... + Ret = abs(Info->bmiHeader.biHeight) * + ((Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes * Info->bmiHeader.biBitCount + 31) & ~31 ) / 8; + } + return Ret; +} + + /* * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006 * from file dib.c from gdi32.dll or orginal version @@ -111,15 +140,41 @@ PBITMAPINFO pConvertedInfo; UINT ConvertedInfoSize; HBITMAP hBitmap = NULL; + PVOID bmBits = NULL; pConvertedInfo = ConvertBitmapInfo(BitmapInfo, Usage, &ConvertedInfoSize, FALSE); if (pConvertedInfo) - { - hBitmap = NtGdiCreateDIBSection(hDC, hSection, dwOffset, pConvertedInfo, Usage, 0, 0, 0, Bits); + { // Verify header due to converted may == info. + if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) + { + if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + } + bmBits = Bits; + hBitmap = NtGdiCreateDIBSection( hDC, + hSection, + dwOffset, + pConvertedInfo, + Usage, + 0, + 0, + 0, + &bmBits); if (BitmapInfo != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + + if (!hBitmap) + { + bmBits = NULL; + } } + + if (Bits) *Bits = bmBits; return hBitmap; } @@ -191,6 +246,28 @@ } /* + * @unimplemented + */ +HBITMAP STDCALL +CreateBitmap(INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + PCVOID pUnsafeBits) +{ + /* FIXME some part should be done in user mode */ + if (Width && Height) + { + return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); + } + else + { + /* Return 1x1 bitmap */ + return GetStockObject(DEFAULT_BITMAP); + } +} + +/* * @implemented */ HBITMAP WINAPI @@ -234,9 +311,35 @@ INT Width, INT Height) { - /* FIXME some part shall be done in user mode */ - return NtGdiCreateCompatibleBitmap(hDC, Width, Height); -} + PDC_ATTR pDc_Attr; + HBITMAP hBmp = NULL; + DIBSECTION dibs; + + if (!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + return NULL; + + if ( !Width || !Height ) + return GetStockObject(DEFAULT_BITMAP); + + if (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)) + { + return NtGdiCreateCompatibleBitmap(hDC, Width, Height); + } + + hBmp = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_BITMAP); + + if ( GetObjectA(hBmp, sizeof(DIBSECTION), &dibs) != sizeof(DIBSECTION) ) + return NULL; + + if ( dibs.dsBm.bmBitsPixel <= 8 ) + GetDIBColorTable(hDC, 0, 256, (RGBQUAD *)&dibs.dsBitfields); + + dibs.dsBmih.biWidth = Width; + dibs.dsBmih.biHeight = Height; + + return CreateDIBSection(hDC, (CONST BITMAPINFO *)&dibs.dsBmih, 0, NULL, NULL, 0); +} + @@ -251,34 +354,50 @@ LPBITMAPINFO lpbmi, UINT uUsage) { - INT ret = 0; - - if (hDC == NULL || !GdiIsHandleValid((HGDIOBJ)hDC)) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - } - else if (lpbmi == NULL) - { - // XP doesn't run this check and results in a - // crash in DIB_BitmapMaxBitsSize, we'll be more forgiving - GdiSetLastError(ERROR_INVALID_PARAMETER); - } - else - { - UINT cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - - ret = NtGdiGetDIBitsInternal(hDC, - hbmp, - uStartScan, - cScanLines, - lpvBits, - lpbmi, - uUsage, - cjBmpScanSize, - 0); - } - - return ret; + INT Ret = 0; + UINT cjBmpScanSize; + PVOID pvSafeBits = lpvBits; + + if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC)) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return Ret; + } + + cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); + + if ( lpvBits ) + { + if ( lpbmi ) + { + if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) + { + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || + lpbmi->bmiHeader.biCompression == BI_PNG ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return Ret; + } + } + } + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + } + + Ret = NtGdiGetDIBitsInternal(hDC, + hbmp, + uStartScan, + cScanLines, + pvSafeBits, + lpbmi, + uUsage, + cjBmpScanSize, + 0); + if ( lpvBits ) + { + RtlCopyMemory( lpvBits, pvSafeBits, cjBmpScanSize); + RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); + } + return Ret; } /* @@ -293,26 +412,73 @@ const BITMAPINFO *Data, UINT ColorUse) { - LONG width, height, compr, dibsize; - WORD planes, bpp; - - if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - return NtGdiCreateDIBitmapInternal(hDC, - width, - height, - Init, - (LPBYTE)Bits, - (PBITMAPINFO)Data, - ColorUse, - bpp, - dibsize, - 0, - 0); + LONG width, height, compr, dibsize; + WORD planes, bpp; +// PDC_ATTR pDc_Attr; + PBITMAPINFO pConvertedInfo; + UINT ConvertedInfoSize; + UINT cjBmpScanSize; + PVOID pvSafeBits = NULL; + HBITMAP hBmp; + + pConvertedInfo = ConvertBitmapInfo(Data, ColorUse, + &ConvertedInfoSize, FALSE); + + if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + 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); + + if ( !width || !height ) + hBmp = GetStockObject(DEFAULT_BITMAP); + else + { + if ( Bits ) + { + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if ( pvSafeBits ) + RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); + } + + hBmp = NtGdiCreateDIBitmapInternal(hDC, + width, + height, + Init, + (LPBYTE)pvSafeBits, + (PBITMAPINFO)pConvertedInfo, + ColorUse, + ConvertedInfoSize, + cjBmpScanSize, + 0, + 0); + + if ( Bits ) + RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); + } +Exit: + if (Data != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + return hBmp; } #if 0 // FIXME!!! This is a victim of the Win32k Initialization BUG!!!!! @@ -419,7 +585,25 @@ CONST BITMAPINFO *lpbmi, UINT fuColorUse) { - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); + INT LinesCopied = 0; + +// This needs to be almost the sames as SetDIBitsToDevice + + if ( !cScanLines || !lpbmi || !lpvBits || (GDI_HANDLE_GET_TYPE(hbmp) != GDI_OBJECT_TYPE_BITMAP)) + return 0; + + if ( fuColorUse && fuColorUse != DIB_PAL_COLORS && fuColorUse != DIB_PAL_COLORS+1 ) + return 0; + + LinesCopied = NtGdiSetDIBits( hdc, + hbmp, + uStartScan, + cScanLines, + lpvBits, + lpbmi, + fuColorUse); + + return LinesCopied; } /* @@ -429,7 +613,7 @@ INT STDCALL SetDIBitsToDevice( - HDC hDC, + HDC hdc, int XDest, int YDest, DWORD Width, @@ -442,22 +626,111 @@ CONST BITMAPINFO *lpbmi, UINT ColorUse) { - return NtGdiSetDIBitsToDeviceInternal(hDC, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)Bits, - (LPBITMAPINFO)lpbmi, - ColorUse, - lpbmi->bmiHeader.biSizeImage, - lpbmi->bmiHeader.biSize, - TRUE, - NULL); + PDC_ATTR pDc_Attr; + PBITMAPINFO pConvertedInfo; + UINT ConvertedInfoSize; + INT LinesCopied = 0; + UINT cjBmpScanSize = 0; + PVOID pvSafeBits = (PVOID)Bits; + + if ( !ScanLines || !lpbmi || !Bits ) + return 0; + + if ( ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS+1 ) + return 0; + + pConvertedInfo = ConvertBitmapInfo(lpbmi, ColorUse, + &ConvertedInfoSize, FALSE); + if (!pConvertedInfo) + return 0; + +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetDIBitsToDevice( hdc, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + Bits, + lpbmi, + ColorUse); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetDIBitsToDevice(hdc, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + Bits, + lpbmi, + ColorUse); + } + return 0; + } + } +#endif + cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, ScanLines); + + if ( Bits ) + { + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); + } + + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } +/* + if ( !pDc_Attr || + ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ + { + LinesCopied = NtGdiSetDIBitsToDeviceInternal( hdc, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + (LPBYTE)pvSafeBits, + (LPBITMAPINFO)pConvertedInfo, + ColorUse, + cjBmpScanSize, + ConvertedInfoSize, + TRUE, + NULL); + } + if ( Bits ) + RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); + if (lpbmi != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + + return LinesCopied; } @@ -481,9 +754,133 @@ DWORD dwRop) { - DPRINT("StretchDIBits %x : %x\n", lpBits, lpBitsInfo); - /* FIXME share memory */ - return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, - nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); -} - + PDC_ATTR pDc_Attr; + PBITMAPINFO pConvertedInfo = NULL; + UINT ConvertedInfoSize = 0; + INT LinesCopied = 0; + UINT cjBmpScanSize = 0; + PVOID pvSafeBits = NULL; + BOOL Hit = FALSE; + + DPRINT("StretchDIBits %x : %x : %d\n", lpBits, lpBitsInfo, iUsage); +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_StretchBlt( hdc, + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + lpBits, + lpBitsInfo, + iUsage, + dwRop); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_StretchBlt(hdc, + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + lpBits, + lpBitsInfo, + iUsage, + dwRop); + } + return 0; + } + } +#endif + if ( iUsage ) // Save time, we only look at non RGB. + { + pConvertedInfo = ConvertBitmapInfo(lpBitsInfo, iUsage, + &ConvertedInfoSize, FALSE); + if (!pConvertedInfo) + { + return 0; + } + } + else + pConvertedInfo = (PBITMAPINFO)lpBitsInfo; + + cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)pConvertedInfo); + + if ( lpBits ) + { + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + { + _SEH_TRY + { + RtlCopyMemory( pvSafeBits, lpBits, cjBmpScanSize ); + } + _SEH_HANDLE + { + Hit = TRUE; + } + _SEH_END + + if (Hit) + { + // We don't die, we continue on with a allocated safe pointer to kernel + // space..... + DPRINT1("StretchDIBits fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,lpBits,cjBmpScanSize); + } + DPRINT("StretchDIBits Allocate Bits %d!!!\n", cjBmpScanSize); + } + } + + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } +/* + if ( !pDc_Attr || + ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ + { + LinesCopied = NtGdiStretchDIBitsInternal( hdc, + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + pvSafeBits, + pConvertedInfo, + (DWORD)iUsage, + dwRop, + ConvertedInfoSize, + cjBmpScanSize, + NULL); + } + if ( pvSafeBits ) + RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); + if (lpBitsInfo != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + + return LinesCopied; +} + Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ut… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -214,32 +214,7 @@ if (FollowedByData) { - if (BitmapInfo->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - DataSize = - CoreBitmapInfo->bmciHeader.bcHeight * - CoreBitmapInfo->bmciHeader.bcWidth * - CoreBitmapInfo->bmciHeader.bcBitCount; - DataSize = ((DataSize + 31) & ~31) / 8; - DataSize *= CoreBitmapInfo->bmciHeader.bcPlanes; - } - else - { - if (BitmapInfo->bmiHeader.biCompression == BI_RGB || - BitmapInfo->bmiHeader.biCompression == BI_BITFIELDS) - { - DataSize = - abs(BitmapInfo->bmiHeader.biHeight) * - BitmapInfo->bmiHeader.biWidth * - BitmapInfo->bmiHeader.biBitCount; - DataSize = ((DataSize + 31) & ~31) / 8; - DataSize *= BitmapInfo->bmiHeader.biPlanes; - } - else - { - DataSize = BitmapInfo->bmiHeader.biSizeImage; - } - } + DataSize = DIB_BitmapBitsSize((PBITMAPINFO)BitmapInfo ); } /* Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -270,6 +270,7 @@ VOID FASTCALL IntvGetDeviceCaps(PGDIDEVICE, PDEVCAPS); HPEN FASTCALL IntGdiSelectPen(PDC,HPEN); HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH); +INT FASTCALL IntGdiGetDeviceCaps(PDC,INT); extern PGDIDEVICE pPrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Nov 17 23:36:19 2008 @@ -317,7 +317,7 @@ DC_UnlockDc(Dc); return 0; } - + // Need SEH to check Bits and bmi. BTW bmi was converted in gdi. Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); DC_UnlockDc(Dc); @@ -399,7 +399,7 @@ ptSource.y = YSrc; /* Enter SEH, as the bits are user mode */ - _SEH_TRY + _SEH_TRY // Look at NtGdiStretchDIBitsInternal { SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; @@ -541,8 +541,8 @@ /* fill out the BITMAPINFO struct */ if (Bits == NULL) { - _SEH_TRY - { + _SEH_TRY // Look at NtGdiStretchDIBitsInternal + { // Why check for anything, we converted in gdi! if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; @@ -806,10 +806,28 @@ HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; + BOOL Hit = FALSE; if (!Bits || !BitsInfo) { SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + _SEH_TRY + { + ProbeForRead(BitsInfo, cjMaxInfo, 1); + ProbeForRead(Bits, cjMaxBits, 1); + } + _SEH_HANDLE + { + Hit = TRUE; + } + _SEH_END + + if (Hit) + { + DPRINT1("NtGdiStretchDIBitsInternal fail to read BitMapInfo: %x or Bits: %x\n",BitsInfo,Bits); return 0; } @@ -993,6 +1011,7 @@ { PDC Dc; HBITMAP Bmp; + UINT bpp; if (!hDc) { // Should use System Bitmap DC hSystemBM, with CreateCompatibleDC for this. @@ -1010,9 +1029,8 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return NULL; } - - cjMaxInitInfo = 1; - Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage); + bpp = IntGdiGetDeviceCaps(Dc, BITSPIXEL); + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); NtGdiDeleteObjectApp(hDc); @@ -1025,8 +1043,16 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return NULL; } - - Bmp = IntCreateDIBitmap(Dc, cx, cy, cjMaxInitInfo, fInit, pjInit, pbmi, iUsage); + /* 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.biBitCount; + else + bpp = IntGdiGetDeviceCaps(Dc, BITSPIXEL); + + Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); DC_UnlockDc(Dc); } return Bmp;

15 years, 10 months

[tkreuzer] 37435: - Fix several ULONG/ULONG_PTR issues - Add a parameter to DefaultQueryInfoBufferCheck for ULONG_PTR/SIZE_T ResultLength

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 17 21:41:21 2008 New Revision: 37435 URL: http://svn.reactos.org/svn/reactos?rev=37435&view=rev Log: - Fix several ULONG/ULONG_PTR issues - Add a parameter to DefaultQueryInfoBufferCheck for ULONG_PTR/SIZE_T ResultLength Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/event.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/mutant.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sem.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/timer.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/iocomp.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/bochs.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_symbols.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/event.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -334,6 +334,7 @@ EventInformation, EventInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -36,9 +36,9 @@ { Entry->Next = FirstEntry; NextEntry = FirstEntry; - FirstEntry = (PVOID)_InterlockedCompareExchange((PLONG)Head, - (LONG)Entry, - (LONG)FirstEntry); + FirstEntry = InterlockedCompareExchangePointer((PVOID*)Head, + (PVOID)Entry, + (PVOID)FirstEntry); } while (FirstEntry != NextEntry); return FirstEntry; @@ -56,9 +56,9 @@ if (!FirstEntry) return NULL; NextEntry = FirstEntry; - FirstEntry = (PVOID)_InterlockedCompareExchange((PLONG)Head, - (LONG)FirstEntry->Next, - (LONG)FirstEntry); + FirstEntry = InterlockedCompareExchangePointer((PVOID*)Head, + (PVOID)FirstEntry->Next, + (PVOID)FirstEntry); } while (FirstEntry != NextEntry); return FirstEntry; @@ -68,7 +68,7 @@ FASTCALL ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) { - return (PVOID)_InterlockedExchange((PLONG)&ListHead->Next.Next, (LONG)NULL); + return InterlockedExchangePointer((PVOID*)&ListHead->Next.Next, NULL); } PSLIST_ENTRY Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -245,6 +245,7 @@ MutantInformation, MutantInformationLength, ResultLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -237,6 +237,7 @@ SemaphoreInformation, SemaphoreInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -1055,7 +1055,7 @@ for (Count = 0; HandleCount > 0 ; HandleCount--) { - Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; + Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG_PTR)pr->UniqueProcessId; Count++; i++; } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -522,6 +522,7 @@ TimerInformation, TimerInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status)) return Status; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -213,6 +213,7 @@ PVOID Buffer, ULONG BufferLength, PULONG ReturnLength, + PULONG_PTR ReturnLengthLong, KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; @@ -248,6 +249,10 @@ if (ReturnLength != NULL) { ProbeForWriteUlong(ReturnLength); + } + if (ReturnLengthLong != NULL) + { + ProbeForWrite(ReturnLengthLong, sizeof(ULONG_PTR), sizeof(ULONG_PTR)); } } _SEH_HANDLE Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -404,6 +404,7 @@ IoCompletionInformation, IoCompletionInformationLength, ResultLength, + NULL, PreviousMode); if (!NT_SUCCESS(Status)) return Status; @@ -506,11 +507,11 @@ ListEntry = KeRemoveQueue(Queue, PreviousMode, Timeout); /* If we got a timeout or user_apc back, return the status */ - if (((NTSTATUS)ListEntry == STATUS_TIMEOUT) || - ((NTSTATUS)ListEntry == STATUS_USER_APC)) + if (((NTSTATUS)(ULONG_PTR)ListEntry == STATUS_TIMEOUT) || + ((NTSTATUS)(ULONG_PTR)ListEntry == STATUS_USER_APC)) { /* Set this as the status */ - Status = (NTSTATUS)ListEntry; + Status = (NTSTATUS)(ULONG_PTR)ListEntry; } else { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -1191,7 +1191,7 @@ if (LastStackPtr->Control & SL_ERROR_RETURNED) { /* Get the error code */ - ErrorCode = (NTSTATUS)LastStackPtr->Parameters.Others.Argument4; + ErrorCode = PtrToUlong(LastStackPtr->Parameters.Others.Argument4); } /* Get the Current Stack and skip it */ @@ -1213,7 +1213,7 @@ /* Update the error for the current stack */ ErrorCode = Irp->IoStatus.Status; StackPtr->Control |= SL_ERROR_RETURNED; - LastStackPtr->Parameters.Others.Argument4 = (PVOID)ErrorCode; + LastStackPtr->Parameters.Others.Argument4 = UlongToPtr(ErrorCode); LastStackPtr->Control |= SL_ERROR_RETURNED; } } @@ -1587,7 +1587,7 @@ IoGetRequestorProcessId(IN PIRP Irp) { /* Return the requestor process' id */ - return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); + return PtrToUlong(IoGetRequestorProcess(Irp)->UniqueProcessId); } /* @@ -1759,5 +1759,5 @@ IoSetTopLevelIrp(IN PIRP Irp) { /* Set the IRP */ - PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; -} + PsGetCurrentThread()->TopLevelIrp = (ULONG_PTR)Irp; +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -52,7 +52,7 @@ #ifdef DBG case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ { - switch ((ULONG)Buffer1) + switch ((ULONG_PTR)Buffer1) { case DumpNonPagedPool: MiDebugDumpNonPagedPool(FALSE); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/wrappers/bochs.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -45,7 +45,7 @@ if (BootPhase == 0) { Value = READ_PORT_UCHAR(BOCHS_LOGGER_PORT); - if (Value != (ULONG)BOCHS_LOGGER_PORT) + if (Value != (ULONG_PTR)BOCHS_LOGGER_PORT) { KdpDebugMode.Bochs = FALSE; return; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -657,10 +657,10 @@ KdbpSymAddCachedFile(&LdrEntry->FullDllName, LdrEntry->PatchInformation); } - DPRINT("Installed symbols: %wZ@%08x-%08x %p\n", + DPRINT("Installed symbols: %wZ@%p-%p %p\n", &LdrEntry->BaseDllName, LdrEntry->DllBase, - LdrEntry->SizeOfImage + (ULONG)LdrEntry->DllBase, + (PVOID)(LdrEntry->SizeOfImage + (ULONG_PTR)LdrEntry->DllBase), LdrEntry->PatchInformation); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -4242,6 +4242,7 @@ sizeof(ExSectionInfoClass) / sizeof(ExSectionInfoClass[0]), SectionInformation, SectionInformationLength, + NULL, ResultLength, PreviousMode); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Nov 17 21:41:21 2008 @@ -871,6 +871,7 @@ TokenInformation, TokenInformationLength, ReturnLength, + NULL, PreviousMode); if(!NT_SUCCESS(Status))

15 years, 10 months

[tkreuzer] 37434: ETHREAD.TopLevelIrp is ULONG_PTR, not ULONG

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 17 21:01:31 2008 New Revision: 37434 URL: http://svn.reactos.org/svn/reactos?rev=37434&view=rev Log: ETHREAD.TopLevelIrp is ULONG_PTR, not ULONG Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Mon Nov 17 21:01:31 2008 @@ -1085,7 +1085,7 @@ #endif PPS_IMPERSONATION_INFORMATION ImpersonationInfo; LIST_ENTRY IrpList; - ULONG TopLevelIrp; + ULONG_PTR TopLevelIrp; PDEVICE_OBJECT DeviceToVerify; #if (NTDDI_VERSION >= NTDDI_LONGHORN) PPSP_RATE_APC RateControlApc;

15 years, 10 months

← Newer
1
...
32
33
34
35
36
37
38
...
66
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 November 2008