Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 42641: - Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) to the PATH and call all .cmd files directly. I've renamed some batch files to match the macro names and added some new ones, for which no batch file existed. (except "env", this command has been removed) Now these commands can be called from other batch files and stuff like "clean & make" will work as well. - Fix raddr2line.cmd to properly handle spaces in the path. Thanks to G
by cfinck＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: cfinck Date: Wed Aug 12 22:54:02 2009 New Revision: 42641 URL: http://svn.reactos.org/svn/reactos?rev=42641&view=rev Log: - Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) to the PATH and call all .cmd files directly. I've renamed some batch files to match the macro names and added some new ones, for which no batch file existed. (except "env", this command has been removed) Now these commands can be called from other batch files and stuff like "clean & make" will work as well. - Fix raddr2line.cmd to properly handle spaces in the path. Thanks to Gunnar for the hints :-) Added: trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd (with props) trunk/tools/RosBE/RosBE-Windows/Root/Make.cmd - copied unchanged from r42638, trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Makex.cmd - copied unchanged from r42638, trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd (with props) trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd - copied, changed from r42638, trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Removed: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Added: trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bas… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd [iso-8859-1] Wed Aug 12 22:54:02 2009 @@ -1,0 +1,1 @@ +@cd /d "%_ROSBE_ROSSOURCEDIR%" Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Basedir.cmd ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd (removed) @@ -1,24 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/Build-Multi.cmd -:: PURPOSE: Perform a multiprocessor build -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -:: Colin Finck <colin(a)reactos.org> -:: Peter Ward <dralnix(a)gmail.com> -:: - -@echo off -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -setlocal enabledelayedexpansion - -:: Set the options for a multiprocessor build -set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% -set TITLE_COMMAND=makex %* - -call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* -endlocal Removed: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (removed) @@ -1,24 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/Build.cmd -:: PURPOSE: Perform a uniprocessor build -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -:: Colin Finck <colin(a)reactos.org> -:: Peter Ward <dralnix(a)gmail.com> -:: - -@echo off -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -setlocal enabledelayedexpansion - -:: Set the options for a uniprocessor build -set MAKE_JOBS=1 -set TITLE_COMMAND=make %* - -call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* -endlocal Added: trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ren… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd [iso-8859-1] Wed Aug 12 22:54:02 2009 @@ -1,0 +1,1 @@ +@for /f "usebackq tokens=*" %%i in (`set _ROSBE_`) do @echo %%i Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Renv.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Aug 12 22:54:02 2009 @@ -43,7 +43,7 @@ set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% -set _ROSBE_ORIGINALPATH=%_ROSBE_HOST_MINGWPATH%\bin;%PATH% +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH% set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe :: Get the number of CPUs in the system so we know how many jobs to execute. @@ -86,20 +86,6 @@ ) ) -:: Load the DOSKEY macros and remove non-existent ones -doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - -if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) -if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) -if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) -if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) -if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) -if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) -if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) -if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) -if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) -if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) - call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" cls Removed: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac (removed) @@ -1,18 +1,0 @@ -BASEDIR = cd /d "%_ROSBE_ROSSOURCEDIR%" -CHDEFDIR = "%_ROSBE_BASEDIR%\chdefdir.cmd" $* -CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* -CHARCH = "%_ROSBE_BASEDIR%\charch.cmd" $* -CLEAN = "%_ROSBE_BASEDIR%\Clean.cmd" $* -CONFIG = "%_ROSBE_BASEDIR%\Config.cmd" $* -ENV = set -HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* -MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build-Multi.cmd" $* -RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* -RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i -SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* -SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* -SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* -UPDATE = "%_ROSBE_BASEDIR%\update.cmd" $* -OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $* -VERSION = "%_ROSBE_BASEDIR%\version.cmd" $* Copied: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd (from r42638, trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Wed Aug 12 22:54:02 2009 @@ -49,9 +49,9 @@ :: Check if the user supplied a path, if they didn't look for :: the specified file in the current directory and any :: sub-directories. -"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %FILEPATH% +"%_ROSBE_BASEDIR%\Tools\chkslash.exe" "%FILEPATH%" if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %FILEPATH% 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i + for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%" 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i ) :: First get the ImageBase of the File. If its smaller than the given @@ -60,7 +60,7 @@ :: give the result to raddr2line. echo %FILEPATH% -for /f "tokens=2" %%i in ('"objdump -p %FILEPATH% 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i +for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i if %%i lss %ADDRESS% ( "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" Removed: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (removed) @@ -1,76 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/reladdr2line.cmd -:: PURPOSE: Converts a value to hex and displays it. -:: COPYRIGHT: Copyright 2009 Christoph von Wittich <Christoph_vW(a)reactos.org> -:: Daniel Reimer <reimer.daniel(a)freenet.de> -:: Peter Ward <dralnix(a)gmail.com> -:: Colin Finck <colin(a)reactos.org> -:: - -@echo off -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -setlocal enabledelayedexpansion -title reladdr2line... - -if not "%3" == "" ( - echo ERROR: Too many parameters specified. - goto :EOC -) - -:: Receive all parameters -if "%1" == "" ( - set /p FILEPATH="Please enter the path/file to be examined: " -) else ( - set FILEPATH=%1 -) - -if "%2" == "" ( - set /p ADDRESS="Please enter the address you would like to analyze: " -) else ( - set ADDRESS=%2 -) - -:: Check if parameters were really given -if "%FILEPATH%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC -) -if "%ADDRESS%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC -) - -:: Check if the user supplied a path, if they didn't look for -:: the specified file in the current directory and any -:: sub-directories. -"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %FILEPATH% -if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %FILEPATH% 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i -) - -:: First get the ImageBase of the File. If its smaller than the given -:: Parameter, everything is ok, because it was already added onto the -:: adress and can be given directly to raddr2line. If not, add it and -:: give the result to raddr2line. -echo %FILEPATH% - -for /f "tokens=2" %%i in ('"objdump -p %FILEPATH% 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i - -if %%i lss %ADDRESS% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" -) else ( - set /a BASEADDRESS+=0x%ADDRESS% - - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" !BASEADDRESS!"') do set RELBASE=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "!FILEPATH!" "!RELBASE!" -) - -:EOC -title ReactOS Build Environment %_ROSBE_VERSION% -endlocal

1 0

[sginsberg] 42640: - Sync some headers to trunk, fix misc. msvc errors in the code -- win32k now compiles
by sginsberg＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: sginsberg Date: Wed Aug 12 22:45:35 2009 New Revision: 42640 URL: http://svn.reactos.org/svn/reactos?rev=42640&view=rev Log: - Sync some headers to trunk, fix misc. msvc errors in the code -- win32k now compiles Modified: branches/arwinss/reactos/include/crt/float.h branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/dxsdk/ddraw.h branches/arwinss/reactos/include/reactos/debug.h branches/arwinss/reactos/include/reactos/probe.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/main/err.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c Modified: branches/arwinss/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/flo… ============================================================================== --- branches/arwinss/reactos/include/crt/float.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/crt/float.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -16,7 +16,9 @@ * */ +#ifdef __GNUC__ #include_next<float.h> +#endif #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… ============================================================================== --- branches/arwinss/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/ddk/winddk.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -10277,6 +10277,7 @@ IN PCCH Format, IN ...); +NTSYSAPI ULONG DDKCDECLAPI DbgPrintEx( Modified: branches/arwinss/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/dxsdk/d… ============================================================================== --- branches/arwinss/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/dxsdk/ddraw.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -8,8 +8,8 @@ #include <objbase.h> #else #define IUnknown void -#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) - #define CO_E_NOTINITIALIZED 0x800401F0 +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H) + #define CO_E_NOTINITIALIZED 0x800401F0L #endif #endif Modified: branches/arwinss/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/debug.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -31,6 +31,7 @@ IN ... ); +NTSYSAPI ULONG __cdecl DbgPrintEx( Modified: branches/arwinss/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/probe.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -12,14 +12,6 @@ #if defined(_WIN32K_) static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; -#endif - -#if defined(_WIN32K_) -/* - * NOTE: NTOSKRNL unfortunately doesn't export RtlRaiseStatus! - */ -VOID NTAPI W32kRaiseStatus(NTSTATUS Status); -#define RtlRaiseStatus W32kRaiseStatus #endif /* @@ -29,7 +21,7 @@ do { \ if ((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ - RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ + ExRaiseAccessViolation(); \ } \ *(volatile Type *)(Ptr) = *(volatile Type *)(Ptr); \ } while (0) @@ -60,7 +52,7 @@ #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ - ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ + ExRaiseAccessViolation(), Default : \ *(const volatile Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) @@ -90,7 +82,7 @@ do { \ if ((ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ - RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ + ExRaiseAccessViolation(); \ } \ *(volatile HANDLE *)(Ptr) = NULL; \ } while (0) @@ -113,7 +105,7 @@ ArraySize = ItemSize * ItemCount; if (ArraySize / ItemSize != ItemCount) { - RtlRaiseStatus (STATUS_INVALID_PARAMETER); + ExRaiseStatus(STATUS_INVALID_PARAMETER); } /* Probe the array */ @@ -135,7 +127,7 @@ ArraySize = ItemSize * ItemCount; if (ArraySize / ItemSize != ItemCount) { - RtlRaiseStatus (STATUS_INVALID_PARAMETER); + ExRaiseStatus(STATUS_INVALID_PARAMETER); } /* Probe the array */ Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -134,6 +134,6 @@ RosUserGetAsyncKeyboardState(BYTE key_state_table[]); VOID NTAPI -RosUserConnectCsrss(); +RosUserConnectCsrss(VOID); #endif /* __WIN32K_NTUSER_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -110,8 +110,9 @@ DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status); } else { + PDRIVERS DriverInfo; hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress; - PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); + DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS)); DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength; DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length; DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool, GdiDriverInfo.DriverName.MaximumLength); Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -20,7 +20,7 @@ OUT PUSHORT AnsiCodePage) { /* Call Rtl */ - return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); + RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -349,6 +349,9 @@ PBASEOBJECT newObject = NULL; HANDLE CurrentProcessId, LockedProcessId; UCHAR TypeIndex; + UINT Index; + PGDI_TABLE_ENTRY Entry; + LONG TypeInfo; GDIDBG_INITLOOPTRACE(); @@ -372,10 +375,6 @@ DPRINT1("Not enough memory to allocate gdi object!\n"); return NULL; } - - UINT Index; - PGDI_TABLE_ENTRY Entry; - LONG TypeInfo; CurrentProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -28,6 +28,7 @@ #include <windef.h> #include <winerror.h> #include <wingdi.h> +#define NT_BUILD_ENVIRONMENT #include <winddi.h> #include <winuser.h> #include <prntfont.h> Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -141,11 +141,11 @@ // fd stuff struct wait_queue_entry; -struct fd {}; +struct fd {int a;}; -struct event {}; +struct event {int a;}; -struct async_queue {}; +struct async_queue {int a;}; unsigned int default_fd_map_access( struct object *obj, unsigned int access ); void set_fd_events( struct fd *fd, int events ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/err.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/err.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/err.c [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -61,22 +61,4 @@ return 0; } -VOID -APIENTRY -W32kRaiseStatus(NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - /* Create an exception record */ - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&ExceptionRecord); - - /* If we returned, raise a status */ - W32kRaiseStatus(Status); -} - /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Wed Aug 12 22:45:35 2009 @@ -1154,9 +1154,10 @@ static struct timer *set_timer( struct msg_queue *queue, unsigned int rate ) { LARGE_INTEGER current_time; + struct timer *timer; KeQuerySystemTime(&current_time); - struct timer *timer = mem_alloc( sizeof(*timer) ); + timer = mem_alloc( sizeof(*timer) ); if (timer) { timer->rate = max( rate, 1 );

1 0

[fireball] 42639: - Fix an epic typo in GreCreateBitmap which inverted bottomdown bitmaps and kept topdown as they were. As a result a hack in EngCreateBitmap goes away. - Add a internal surface flags field to SURFACE structure, and add the one and only flag for now - SRF_BITSALLOCD, which means that the bitmap's bits are allocated by GRE. - Free up GRE allocated bitmap's bits in the cleanup routine. Leaks--;
by fireball＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: fireball Date: Wed Aug 12 22:27:16 2009 New Revision: 42639 URL: http://svn.reactos.org/svn/reactos?rev=42639&view=rev Log: - Fix an epic typo in GreCreateBitmap which inverted bottomdown bitmaps and kept topdown as they were. As a result a hack in EngCreateBitmap goes away. - Add a internal surface flags field to SURFACE structure, and add the one and only flag for now - SRF_BITSALLOCD, which means that the bitmap's bits are allocated by GRE. - Free up GRE allocated bitmap's bits in the cleanup routine. Leaks--; Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Wed Aug 12 22:27:16 2009 @@ -23,9 +23,6 @@ IN PVOID Bits) { HBITMAP hNewBitmap; - - /* HACK: Why?! */ - Flags ^= BMF_TOPDOWN; /* Call the internal routine */ hNewBitmap = GreCreateBitmap(Size, Width, Format, Flags, Bits); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Wed Aug 12 22:27:16 2009 @@ -171,14 +171,17 @@ { /* Allocate memory for bitmap bits */ pSurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - pSurfObj->cjBits, TAG_DIB); - + pSurfObj->cjBits, + TAG_DIB); if (!pSurfObj->pvBits) { /* Cleanup and exit */ GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); return 0; } + + /* Indicate we allocated memory ourselves */ + pSurface->ulFlags |= SRF_BITSALLOCD; } else { @@ -187,8 +190,8 @@ pSurfObj->pvScan0 = pSurfObj->pvBits; - /* Override the 0th scanline if it's topdown */ - if (Flags & BMF_TOPDOWN) + /* Override the 0th scanline if it's not topdown */ + if (!(Flags & BMF_TOPDOWN)) { pSurfObj->pvScan0 = (PVOID)((ULONG_PTR)pSurfObj->pvBits + pSurfObj->cjBits - pSurfObj->lDelta); pSurfObj->lDelta = -pSurfObj->lDelta; @@ -205,7 +208,8 @@ if (!pSurface->pBitsLock) { /* Cleanup and return */ - if (!Bits) EngFreeMem(pSurfObj->pvBits); + if (!Bits && (pSurface->ulFlags & SRF_BITSALLOCD)) + EngFreeMem(pSurfObj->pvBits); GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); return 0; } @@ -230,8 +234,9 @@ { PSURFACE pSurf = (PSURFACE)ObjectBody; - /* TODO: Free bits memory */ - //if (pSurf->SurfObj.fl + /* Free bits memory */ + if (pSurf->SurfObj.pvBits && (pSurf->ulFlags & SRF_BITSALLOCD)) + EngFreeMem(pSurf->SurfObj.pvBits); /* Delete DIB palette if it exists */ if (pSurf->hDIBPalette) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Wed Aug 12 22:27:16 2009 @@ -1,6 +1,7 @@ #ifndef __WIN32K_BITMAP_H #define __WIN32K_BITMAP_H +#define SRF_BITSALLOCD 0x01 /* GRE allocated memory for bits itself */ typedef struct _SURFACE { @@ -11,6 +12,7 @@ HPALETTE hDIBPalette; PFAST_MUTEX pBitsLock; /* grab this lock before accessing actual bits in the bitmap */ + ULONG ulFlags; /* implementation specific flags */ } SURFACE, *PSURFACE; HBITMAP

1 0

[pschweitzer] 42638: Now ntoskrnl builds but doesn't link.
by pschweitzer＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: pschweitzer Date: Wed Aug 12 21:11:28 2009 New Revision: 42638 URL: http://svn.reactos.org/svn/reactos?rev=42638&view=rev Log: Now ntoskrnl builds but doesn't link. Modified: branches/pierre-fsd/include/ddk/ntifs.h branches/pierre-fsd/include/ndk/i386/ketypes.h branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c branches/pierre-fsd/ntoskrnl/fsrtl/notify.c branches/pierre-fsd/ntoskrnl/include/internal/i386/ke.h branches/pierre-fsd/ntoskrnl/include/internal/ke.h branches/pierre-fsd/ntoskrnl/include/internal/mm.h branches/pierre-fsd/ntoskrnl/kdbg/kdb.c branches/pierre-fsd/ntoskrnl/mm/anonmem.c branches/pierre-fsd/ntoskrnl/mm/balance.c branches/pierre-fsd/ntoskrnl/mm/freelist.c branches/pierre-fsd/ntoskrnl/mm/i386/page.c branches/pierre-fsd/ntoskrnl/mm/marea.c branches/pierre-fsd/ntoskrnl/mm/mdlsup.c branches/pierre-fsd/ntoskrnl/mm/mm.c branches/pierre-fsd/ntoskrnl/mm/mminit.c branches/pierre-fsd/ntoskrnl/mm/procsup.c branches/pierre-fsd/ntoskrnl/mm/region.c branches/pierre-fsd/ntoskrnl/mm/rmap.c branches/pierre-fsd/ntoskrnl/mm/section.c branches/pierre-fsd/ntoskrnl/mm/virtual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… Modified: branches/pierre-fsd/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ndk/i386/ket… Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/filtr… Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… Modified: branches/pierre-fsd/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… Modified: branches/pierre-fsd/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… Modified: branches/pierre-fsd/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… Modified: branches/pierre-fsd/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/kdbg/kdb.c?… Modified: branches/pierre-fsd/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/anonmem.… Modified: branches/pierre-fsd/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/balance.… Modified: branches/pierre-fsd/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/freelist… Modified: branches/pierre-fsd/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/i386/pag… Modified: branches/pierre-fsd/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/marea.c?… Modified: branches/pierre-fsd/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/mdlsup.c… Modified: branches/pierre-fsd/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/mm.c?rev… Modified: branches/pierre-fsd/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/mminit.c… Modified: branches/pierre-fsd/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/procsup.… Modified: branches/pierre-fsd/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/region.c… Modified: branches/pierre-fsd/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/rmap.c?r… Modified: branches/pierre-fsd/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/section.… Modified: branches/pierre-fsd/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/mm/virtual.…

1 0

[jimtabor] 42637: - Move GetWindowInfo support into user32. Use HWNDPARAM for SetWindowContextHelpId.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 20:46:34 2009 New Revision: 42637 URL: http://svn.reactos.org/svn/reactos?rev=42637&view=rev Log: - Move GetWindowInfo support into user32. Use HWNDPARAM for SetWindowContextHelpId. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -119,3 +119,4 @@ VOID FASTCALL GetConnected(VOID); BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); BOOL FASTCALL TestWindowProcess(PWND); +VOID UserGetWindowBorders(DWORD, DWORD, SIZE *, BOOL); Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -41,7 +41,7 @@ (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) #define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID) + (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) #define NtUserSetCaretPos(X, Y) \ (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS) @@ -54,9 +54,6 @@ #define NtUserSetMenuBarHeight(menu, height) \ (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT) - -#define NtUserGetWindowInfo(hwnd, pwi) \ - (BOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO) #define NtUserRegisterLogonProcess(hproc, x) \ (BOOL)NtUserCallTwoParam((DWORD)hproc, (DWORD)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC) Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -1043,10 +1043,63 @@ * @implemented */ BOOL WINAPI -GetWindowInfo(HWND hwnd, +GetWindowInfo(HWND hWnd, PWINDOWINFO pwi) { - return NtUserGetWindowInfo(hwnd, pwi); + PWND pWnd; + PCLS pCls = NULL; + SIZE Size = {0,0}; + BOOL Ret = FALSE; + + if ( !pwi || pwi->cbSize != sizeof(WINDOWINFO)) + SetLastError(ERROR_INVALID_PARAMETER); // Just set the error and go! + + pWnd = ValidateHwnd(hWnd); + if (!pWnd) + return Ret; + + UserGetWindowBorders(pWnd->style, pWnd->ExStyle, &Size, FALSE); + + _SEH2_TRY + { + pCls = DesktopPtrToUser(pWnd->pcls); + pwi->rcWindow = pWnd->rcWindow; + pwi->rcClient = pWnd->rcClient; + pwi->dwStyle = pWnd->style; + pwi->dwExStyle = pWnd->ExStyle; + pwi->cxWindowBorders = Size.cx; + pwi->cyWindowBorders = Size.cy; + pwi->dwWindowStatus = 0; + if (pWnd->state & WNDS_ACTIVEFRAME) + pwi->dwWindowStatus = WS_ACTIVECAPTION; + pwi->atomWindowType = (pCls ? pCls->atomClassName : 0 ); + + if ( pWnd->state2 & WNDS2_WIN50COMPAT ) + { + pwi->wCreatorVersion = 0x500; + } + else if ( pWnd->state2 & WNDS2_WIN40COMPAT ) + { + pwi->wCreatorVersion = 0x400; + } + else if ( pWnd->state2 & WNDS2_WIN31COMPAT ) + { + pwi->wCreatorVersion = 0x30A; + } + else + { + pwi->wCreatorVersion = 0x300; + } + + Ret = TRUE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; + + return Ret; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -3051,9 +3051,7 @@ #define MSQ_STATE_MENUOWNER 0x4 #define MSQ_STATE_MOVESIZE 0x5 #define MSQ_STATE_CARET 0x6 -#define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0xfffd0058 // use HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID #define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 -#define TWOPARAM_ROUTINE_GETWINDOWINFO 0xfffd0061 #define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -514,64 +514,9 @@ UNIMPLEMENTED RETURN( 0); - case TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID: - - if(!(Window = UserGetWindowObject((HWND)Param1))) - { - RETURN( (DWORD)FALSE); - } - - if ( Param2 ) - IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param2); - else - IntRemoveProp(Window, gpsi->atomContextHelpIdProp); - - RETURN( (DWORD)TRUE); case TWOPARAM_ROUTINE_SETCARETPOS: RETURN( (DWORD)co_IntSetCaretPos((int)Param1, (int)Param2)); - - case TWOPARAM_ROUTINE_GETWINDOWINFO: - { - WINDOWINFO wi; - DWORD Ret; - - if(!(Window = UserGetWindowObject((HWND)Param1))) - { - RETURN( FALSE); - } - -#if 0 - /* - * According to WINE, Windows' doesn't check the cbSize field - */ - - Status = MmCopyFromCaller(&wi.cbSize, (PVOID)Param2, sizeof(wi.cbSize)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - if(wi.cbSize != sizeof(WINDOWINFO)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } -#endif - - if((Ret = (DWORD)IntGetWindowInfo(Window, &wi))) - { - Status = MmCopyToCaller((PVOID)Param2, &wi, sizeof(WINDOWINFO)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - } - - RETURN( Ret); - } case TWOPARAM_ROUTINE_REGISTERLOGONPROC: RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); @@ -803,6 +748,26 @@ case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: return IntKillTimer(hWnd, (UINT_PTR)Param, TRUE); + case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID: + { + PWINDOW_OBJECT Window; + + UserEnterExclusive(); + if(!(Window = UserGetWindowObject(hWnd))) + { + UserLeave(); + return FALSE; + } + + if ( Param ) + IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); + else + IntRemoveProp(Window, gpsi->atomContextHelpIdProp); + + UserLeave(); + return TRUE; + } + case HWNDPARAM_ROUTINE_SETDIALOGPOINTER: { PWINDOW_OBJECT Window; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Aug 12 20:46:34 2009 @@ -1678,6 +1678,7 @@ Wnd->head.pti = ti; Wnd->head.rpdesk = pti->Desktop; Wnd->hWndLastActive = hWnd; + Wnd->state2 |= WNDS2_WIN40COMPAT; } DPRINT("Created object with handle %X\n", hWnd);

1 0

[fireball] 42636: - Add cleanup routine for SURFACE object. Now SURFACE frees all memory except bits if they were allocated (TODO). - Implement surface's bits locking/unlock (same concept as in trunk).
by fireball＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: fireball Date: Wed Aug 12 20:02:42 2009 New Revision: 42636 URL: http://svn.reactos.org/svn/reactos?rev=42636&view=rev Log: - Add cleanup routine for SURFACE object. Now SURFACE frees all memory except bits if they were allocated (TODO). - Implement surface's bits locking/unlock (same concept as in trunk). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Wed Aug 12 20:02:42 2009 @@ -19,9 +19,11 @@ IN LONG y, IN RECTL *prcl) { - SURFACE_LockBitmapBits(pso); + SURFACE *pSurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + + SURFACE_LockBitmapBits(pSurf); GDIDEVFUNCS(pso).MovePointer(pso, x, y, prcl); - SURFACE_UnlockBitmapBits(pso); + SURFACE_UnlockBitmapBits(pSurf); } @@ -41,10 +43,11 @@ ULONG ulResult = SPS_DECLINE; PFN_DrvSetPointerShape pfnSetPointerShape; PPDEVOBJ ppdev = &PrimarySurface; + SURFACE *pSurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; - SURFACE_LockBitmapBits(pso); + SURFACE_LockBitmapBits(pSurf); if (pfnSetPointerShape) { ulResult = pfnSetPointerShape(pso, @@ -82,7 +85,7 @@ ppdev->pfnMovePointer = EngMovePointer; } - SURFACE_UnlockBitmapBits(pso); + SURFACE_UnlockBitmapBits(pSurf); return ulResult; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Wed Aug 12 20:02:42 2009 @@ -51,7 +51,7 @@ {0, 0, 0, NULL}, /* 02 reserved entry */ {0, 0, 0, NULL}, /* 03 reserved entry */ {0, 0, 0, NULL}, /* 04 reserved entry */ - {0, sizeof(SURFACE), TAG_SURFOBJ, GDI_CleanupDummy}, /* 05 SURFACE */ + {0, sizeof(SURFACE), TAG_SURFOBJ, SURFACE_Cleanup}, /* 05 SURFACE */ {0, 0, 0, NULL}, /* 06 reserved entry */ {0, 0, 0, NULL}, /* 07 reserved entry */ {0, sizeof(PALETTE), TAG_PALETTE, GDI_CleanupDummy}, /* 08 PAL */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Wed Aug 12 20:02:42 2009 @@ -197,6 +197,21 @@ /* Set the format */ pSurfObj->iBitmapFormat = Format; + /* Initialize bits lock */ + pSurface->pBitsLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_MUTEX), + TAG_SURFOBJ); + + if (!pSurface->pBitsLock) + { + /* Cleanup and return */ + if (!Bits) EngFreeMem(pSurfObj->pvBits); + GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); + return 0; + } + + ExInitializeFastMutex(pSurface->pBitsLock); + /* Unlock the surface */ SURFACE_Unlock(pSurface); @@ -209,6 +224,25 @@ { GDIOBJ_FreeObjByHandle(hBitmap, GDI_OBJECT_TYPE_BITMAP); } + +BOOL APIENTRY +SURFACE_Cleanup(PVOID ObjectBody) +{ + PSURFACE pSurf = (PSURFACE)ObjectBody; + + /* TODO: Free bits memory */ + //if (pSurf->SurfObj.fl + + /* Delete DIB palette if it exists */ + if (pSurf->hDIBPalette) + GDIOBJ_FreeObjByHandle(pSurf->hDIBPalette, GDI_OBJECT_TYPE_PALETTE); + + /* Free bitslock storage */ + ExFreePoolWithTag(pSurf->pBitsLock, TAG_SURFOBJ); + + return TRUE; +} + LONG FASTCALL GreGetBitmapBits(PSURFACE pSurf, ULONG ulBytes, PVOID pBits) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Wed Aug 12 20:02:42 2009 @@ -10,6 +10,7 @@ FLONG flHooks; HPALETTE hDIBPalette; + PFAST_MUTEX pBitsLock; /* grab this lock before accessing actual bits in the bitmap */ } SURFACE, *PSURFACE; HBITMAP @@ -31,6 +32,9 @@ INT FASTCALL BITMAP_GetWidthBytes(INT bmWidth, INT bpp); +BOOL APIENTRY +SURFACE_Cleanup(PVOID ObjectBody); + #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions #define SURFACE_Lock(hBMObj) \ @@ -42,7 +46,7 @@ #define SURFACE_ShareUnlock(pBMObj) \ GDIOBJ_ShareUnlockObjByPtr ((PBASEOBJECT)pBMObj) -#define SURFACE_LockBitmapBits(x) -#define SURFACE_UnlockBitmapBits(x) +#define SURFACE_LockBitmapBits(pBMObj) ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->pBitsLock) +#define SURFACE_UnlockBitmapBits(pBMObj) ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->pBitsLock) #endif

1 0

[fireball] 42635: - Rewrite RtlpCreateAtomHandle to readable code and fix a problem spotted in bug 4788.
by fireball＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: fireball Date: Wed Aug 12 13:42:34 2009 New Revision: 42635 URL: http://svn.reactos.org/svn/reactos?rev=42635&view=rev Log: - Rewrite RtlpCreateAtomHandle to readable code and fix a problem spotted in bug 4788. Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Aug 12 13:42:34 2009 @@ -516,29 +516,36 @@ HANDLE Handle; USHORT HandleIndex; + /* Initialize ex handle table entry */ ExEntry.Object = Entry; ExEntry.GrantedAccess = 0x1; /* FIXME - valid handle */ + /* Create ex handle */ Handle = ExCreateHandle(AtomTable->ExHandleTable, - &ExEntry); - if (Handle != NULL) + &ExEntry); + if (!Handle) return FALSE; + + /* Calculate HandleIndex (by getting rid of the first two bits) */ + HandleIndex = (USHORT)((ULONG_PTR)Handle >> 2); + + /* Index must be less than 0xC000 */ + if (HandleIndex >= 0xC000) { - HandleIndex = (USHORT)((ULONG_PTR)Handle >> 2); - /* FIXME - Handle Indexes >= 0xC000 ?! */ - if ((ULONG_PTR)HandleIndex >> 2 < 0xC000) - { - Entry->HandleIndex = HandleIndex; - Entry->Atom = 0xC000 + HandleIndex; - - return TRUE; - } - else - ExDestroyHandle(AtomTable->ExHandleTable, - Handle, - NULL); + /* Destroy ex handle */ + ExDestroyHandle(AtomTable->ExHandleTable, + Handle, + NULL); + + /* Return failure */ + return FALSE; } - return FALSE; + /* Initialize atom table entry */ + Entry->HandleIndex = HandleIndex; + Entry->Atom = 0xC000 + HandleIndex; + + /* Return success */ + return TRUE; } PRTL_ATOM_TABLE_ENTRY

1 0

[pschweitzer] 42634: Other resync. Now branch builds up to ntoskrnl.
by pschweitzer＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: pschweitzer Date: Wed Aug 12 10:57:21 2009 New Revision: 42634 URL: http://svn.reactos.org/svn/reactos?rev=42634&view=rev Log: Other resync. Now branch builds up to ntoskrnl. Modified: branches/pierre-fsd/dll/win32/kernel32/misc/console.c branches/pierre-fsd/dll/win32/kernel32/misc/dllmain.c branches/pierre-fsd/drivers/input/kbdclass/kbdclass.c branches/pierre-fsd/drivers/input/kbdclass/kbdclass.h branches/pierre-fsd/drivers/input/kbdclass/misc.c branches/pierre-fsd/include/reactos/win32k/ntgdityp.h Modified: branches/pierre-fsd/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/kernel32/m… ============================================================================== --- branches/pierre-fsd/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -22,6 +22,7 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern RTL_CRITICAL_SECTION ConsoleLock; +extern BOOL ConsoleInitialized; extern BOOL WINAPI IsDebuggerPresent(VOID); /* GLOBALS *******************************************************************/ @@ -3345,7 +3346,6 @@ PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - HANDLE hConsole; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, @@ -3357,7 +3357,6 @@ } CsrRequest = MAKE_CSR_API(GET_TITLE, CSR_CONSOLE); - Request->Data.GetTitleRequest.ConsoleHandle = hConsole; Status = CsrClientCallServer(Request, NULL, @@ -3437,7 +3436,6 @@ ULONG CsrRequest; NTSTATUS Status; unsigned int c; - HANDLE hConsole; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), @@ -3450,7 +3448,6 @@ } CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - Request->Data.SetTitleRequest.Console = hConsole; for (c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++) Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; @@ -3489,7 +3486,6 @@ ULONG CsrRequest; NTSTATUS Status; unsigned int c; - HANDLE hConsole; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, @@ -3503,7 +3499,6 @@ } CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - Request->Data.SetTitleRequest.Console = hConsole; for (c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++) Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; @@ -3543,7 +3538,7 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - + if (dwDesiredAccess & ~(GENERIC_READ | GENERIC_WRITE) || dwShareMode & ~(FILE_SHARE_READ | FILE_SHARE_WRITE) || dwFlags != CONSOLE_TEXTMODE_BUFFER) Modified: branches/pierre-fsd/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/kernel32/m… ============================================================================== --- branches/pierre-fsd/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -26,9 +26,9 @@ HANDLE hBaseDir = NULL; PPEB Peb; ULONG SessionId; +BOOL ConsoleInitialized = FALSE; static BOOL DllInitialized = FALSE; -static BOOL ConsoleInitialized = FALSE; BOOL WINAPI DllMain(HANDLE hInst, @@ -374,6 +374,7 @@ /* Delete DLL critical section */ if (ConsoleInitialized == TRUE) { + ConsoleInitialized = FALSE; RtlDeleteCriticalSection (&ConsoleLock); } RtlDeleteCriticalSection (&DllLock); Modified: branches/pierre-fsd/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/input/kbdcla… ============================================================================== --- branches/pierre-fsd/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -37,7 +37,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CREATE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -54,7 +54,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLOSE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -71,7 +71,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLEANUP\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -92,7 +92,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("IRP_MJ_READ\n"); + TRACE_(CLASS_NAME, "IRP_MJ_READ\n"); ASSERT(DeviceExtension->Common.IsClassDO); @@ -122,7 +122,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status = STATUS_NOT_SUPPORTED; - DPRINT("IRP_MJ_DEVICE_CONTROL\n"); + TRACE_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -170,7 +170,7 @@ break; } default: - DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", + WARN_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); break; @@ -200,7 +200,7 @@ return ForwardIrpAndForget(DeviceObject, Irp); default: { - DPRINT1("Port DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Port DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -208,7 +208,7 @@ } else { - DPRINT1("Class DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Class DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -236,7 +236,7 @@ ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, CLASS_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); @@ -315,7 +315,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("CreateClassDeviceObject(0x%p)\n", DriverObject); + TRACE_(CLASS_NAME, "CreateClassDeviceObject(0x%p)\n", DriverObject); /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -328,19 +328,19 @@ DeviceNameU.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceNameU.MaximumLength, CLASS_TAG); if (!DeviceNameU.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); goto cleanup; } Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->DeviceBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); goto cleanup; } PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); @@ -360,12 +360,12 @@ goto cleanup; else if (Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } DeviceId++; } - DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + WARN_(CLASS_NAME, "Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) @@ -468,7 +468,7 @@ SIZE_T InputCount = DataEnd - DataStart; SIZE_T ReadSize; - DPRINT("ClassCallback()\n"); + TRACE_(CLASS_NAME, "ClassCallback()\n"); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -506,7 +506,7 @@ } KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); - DPRINT("Leaving ClassCallback()\n"); + TRACE_(CLASS_NAME, "Leaving ClassCallback()\n"); return TRUE; } @@ -522,7 +522,7 @@ CONNECT_DATA ConnectData; NTSTATUS Status; - DPRINT("Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); + TRACE_(CLASS_NAME, "Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -578,7 +578,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("Destroying PortDO %p\n", PortDO); + TRACE_(CLASS_NAME, "Destroying PortDO %p\n", PortDO); DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; @@ -634,7 +634,7 @@ PPORT_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; - DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + TRACE_(CLASS_NAME, "ClassAddDevice called. Pdo = 0x%p\n", Pdo); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -653,7 +653,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } IoSetStartIoAttributes(Fdo, TRUE, TRUE); @@ -666,7 +666,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) @@ -686,14 +686,14 @@ &DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); goto cleanup; } } Status = ConnectPortDriver(Fdo, DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ConnectPortDriver() failed with status 0x%08lx\n", Status); goto cleanup; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -725,7 +725,7 @@ KIRQL OldIrql; BOOLEAN wasQueued = FALSE; - DPRINT("ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -762,7 +762,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; - DPRINT("HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -828,7 +828,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; KIRQL OldIrql; - DPRINT("ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -854,7 +854,7 @@ ULONG Size, ResultLength; NTSTATUS Status; - DPRINT("SearchForLegacyDrivers(%p %p %lu)\n", + TRACE_(CLASS_NAME, "SearchForLegacyDrivers(%p %p %lu)\n", DriverObject, Context, Count); if (Count != 1) @@ -868,7 +868,7 @@ &PortBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); goto cleanup; } PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); @@ -879,7 +879,7 @@ KeyValueInformation = ExAllocatePoolWithTag(PagedPool, Size, CLASS_TAG); if (!KeyValueInformation) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -889,13 +889,13 @@ Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -904,13 +904,13 @@ Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -928,16 +928,16 @@ Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); + WARN_(CLASS_NAME, "IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } - DPRINT("Legacy driver found\n"); + INFO_(CLASS_NAME, "Legacy driver found\n"); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } /* A special hack for 1st stage setup: manually send start device to i8042prt */ @@ -973,7 +973,7 @@ (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); @@ -984,14 +984,14 @@ &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); return Status; } @@ -1002,7 +1002,7 @@ &DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); return Status; } } Modified: branches/pierre-fsd/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/input/kbdcla… ============================================================================== --- branches/pierre-fsd/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -4,7 +4,6 @@ #include <stdio.h> #include <pseh/pseh2.h> -#define NDEBUG #include <debug.h> #define MAX_PATH 260 @@ -13,6 +12,7 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define CLASS_TAG TAG('K', 'b', 'd', 'C') +#define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID typedef enum { Modified: branches/pierre-fsd/drivers/input/kbdclass/misc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/input/kbdcla… ============================================================================== --- branches/pierre-fsd/drivers/input/kbdclass/misc.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/input/kbdclass/misc.c [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -37,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(CLASS_NAME, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); Modified: branches/pierre-fsd/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/reactos/win3… ============================================================================== --- branches/pierre-fsd/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/reactos/win32k/ntgdityp.h [iso-8859-1] Wed Aug 12 10:57:21 2009 @@ -229,8 +229,8 @@ typedef struct _UNIVERSAL_FONT_ID { - ULONG CheckSum; - ULONG Index; + ULONG CheckSum; + ULONG Index; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; #define RI_TECH_BITMAP 1 @@ -602,7 +602,13 @@ typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); // -// Most of these are definded in ddk/winddi.h +// Declarations missing in ddk/winddi.h +// +typedef VOID (APIENTRY *PFN_DrvMovePanning)(LONG, LONG, FLONG); + + +// +// Most of these are defined in ddk/winddi.h // typedef struct _DRIVER_FUNCTIONS {

1 0

[jimtabor] 42633: - Check if server side window proc is set when clearing or setting dialog window flag.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 09:42:30 2009 New Revision: 42633 URL: http://svn.reactos.org/svn/reactos?rev=42633&view=rev Log: - Check if server side window proc is set when clearing or setting dialog window flag. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Aug 12 09:42:30 2009 @@ -820,7 +820,8 @@ pWnd = Window->Wnd; if (pWnd->head.pti->ppi == PsGetCurrentProcessWin32Process() && - pWnd->cbwndExtra == DLGWINDOWEXTRA) + pWnd->cbwndExtra == DLGWINDOWEXTRA && + !(pWnd->state & WNDS_SERVERSIDEWINDOWPROC)) { if (Param) {

1 0

[jimtabor] 42632: Rewrite NtUserGetCPD to correctly return the callproc handle pointer.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Wed Aug 12 09:35:15 2009 New Revision: 42632 URL: http://svn.reactos.org/svn/reactos?rev=42632&view=rev Log: Rewrite NtUserGetCPD to correctly return the callproc handle pointer. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Wed Aug 12 09:35:15 2009 @@ -111,6 +111,72 @@ return TRUE; } +/* + Based on UserFindCallProc. + */ +PCALLPROCDATA +FASTCALL +UserSearchForCallProc( + PCALLPROCDATA pcpd, + WNDPROC WndProc, + GETCPD Type) +{ + while ( pcpd && (pcpd->pfnClientPrevious != WndProc || pcpd->wType != Type) ) + { + pcpd = pcpd->spcpdNext; + } + return pcpd; +} + +/* + Get Call Proc Data handle for the window proc being requested or create a + new Call Proc Data handle to be return for the requested window proc. + */ +ULONG_PTR +FASTCALL +UserGetCPD( + PVOID pvClsWnd, + GETCPD Flags, + ULONG_PTR ProcIn) +{ + PCLS pCls; + PWND pWnd; + PCALLPROCDATA CallProc = NULL; + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + + if ( Flags & (UserGetCPDWindow|UserGetCPDDialog) || + Flags & UserGetCPDWndtoCls) + { + pWnd = pvClsWnd; + pCls = pWnd->pcls; + } + else + pCls = pvClsWnd; + + // Search Class call proc data list. + if (pCls->spcpdFirst) + CallProc = UserSearchForCallProc( pCls->spcpdFirst, (WNDPROC)ProcIn, Flags); + + // No luck, create a new one for the requested proc. + if (!CallProc) + { + CallProc = CreateCallProc( NULL, + (WNDPROC)ProcIn, + (Flags & UserGetCPDU2A), + pti->ppi); + if (CallProc) + { + CallProc->spcpdNext = pCls->spcpdFirst; + (void)InterlockedExchangePointer((PVOID*)&pCls->spcpdFirst, + CallProc); + CallProc->wType = Flags; + } + } + return (ULONG_PTR)(CallProc ? GetCallProcHandle(CallProc) : NULL); +} + /* SYSCALLS *****************************************************************/ /* @@ -138,9 +204,7 @@ { PWINDOW_OBJECT Window; PWND Wnd; - PCLS Class; ULONG_PTR Result = 0; - BOOL Ansi; UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) @@ -148,18 +212,10 @@ goto Cleanup; } Wnd = Window->Wnd; - Class = Wnd->pcls; - /* Ex: Retrieve the Unicode Proc since the default is Ansi. */ - Ansi = (Flags & UserGetCPDA2U); // Ansi to Unicode request from user. - - if ( Flags & (UserGetCPDWindow|UserGetCPDDialog)) - { - Result = UserGetWindowLong( hWnd, GWL_WNDPROC, Ansi); - } - else if (Flags & (UserGetCPDClass|UserGetCPDWndtoCls)) - { - Result = UserGetClassLongPtr( Class, GCLP_WNDPROC, Ansi); - } + + // Processing Window only from User space. + if ((Flags & ~(UserGetCPDU2A|UserGetCPDA2U)) != UserGetCPDClass) + Result = UserGetCPD(Wnd, Flags, ProcIn); Cleanup: UserLeave();

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