Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 27395: -let reladdr2line use raddr2line use this tool when you get a trace without the imagebase like in <mouclass.sys:192d>
by cwittich＠svn.reactos.org 05 Jul '07

05 Jul '07

Author: cwittich Date: Thu Jul 5 04:30:28 2007 New Revision: 27395 URL: http://svn.reactos.org/svn/reactos?rev=27395&view=rev Log: -let reladdr2line use raddr2line use this tool when you get a trace without the imagebase like in <mouclass.sys:192d> Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Jul 5 04:30:28 2007 @@ -11,4 +11,4 @@ for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 for /f %%i in ('"%ROSBEBASEDIR%\Tools\echoh %baseaddr%"') do set relbase=%%i -addr2line --exe=%1 %relbase% 2>NUL +raddr2line %1 %relbase% 2>NUL

1 0

[tkreuzer] 27394: co_WinPosSetWindowPos: fix the redrawing (instead of simply removing some code, like my last commit, sorry). Now it works more like on windows and both the problem of a blank control panel and ugly wizard pages are gone. Fixes bug 735, see also bug 902, may fix bug 2141. See issue #735 for more details.
by tkreuzer＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: tkreuzer Date: Thu Jul 5 02:22:30 2007 New Revision: 27394 URL: http://svn.reactos.org/svn/reactos?rev=27394&view=rev Log: co_WinPosSetWindowPos: fix the redrawing (instead of simply removing some code, like my last commit, sorry). Now it works more like on windows and both the problem of a blank control panel and ugly wizard pages are gone. Fixes bug 735, see also bug 902, may fix bug 2141. See issue #735 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Thu Jul 5 02:22:30 2007 @@ -1223,11 +1223,20 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { + PWINDOW_OBJECT Parent = Window->Parent; NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left, Window->WindowRect.top); + if ((Window->Style & WS_CHILD) && + (Parent) && + !(Parent->Style & WS_CLIPCHILDREN)) + { + IntInvalidateWindows(Parent, DirtyRgn, + RDW_ERASE | RDW_INVALIDATE); + co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); + } IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } NtGdiDeleteObject(DirtyRgn); }

1 0

[silverblade] 27393: Including <debug.h> in order to use DPRINT rather than my own homebrew equivalent (using printf!) - this should prevent the un-necessary verbose output when starting cmd.exe now ; )
by silverblade＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: silverblade Date: Wed Jul 4 22:55:23 2007 New Revision: 27393 URL: http://svn.reactos.org/svn/reactos?rev=27393&view=rev Log: Including <debug.h> in order to use DPRINT rather than my own homebrew equivalent (using printf!) - this should prevent the un-necessary verbose output when starting cmd.exe now ;) Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.h (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.h Wed Jul 4 22:55:23 2007 @@ -18,8 +18,7 @@ #include <mmddk.h> #include <stdio.h> -#define DPRINT printf - +#include <debug.h> /* Need to check these */ #define MAX_DEVICES 256

1 0

[fireball] 27392: - IntCallWindowsProc(): DPRINT1 -> DPRINT, it seems it's allright if it's called with WndProc == NULL.
by fireball＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: fireball Date: Wed Jul 4 21:20:06 2007 New Revision: 27392 URL: http://svn.reactos.org/svn/reactos?rev=27392&view=rev Log: - IntCallWindowsProc(): DPRINT1 -> DPRINT, it seems it's allright if it's called with WndProc == NULL. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Wed Jul 4 21:20:06 2007 @@ -1185,7 +1185,7 @@ if (WndProc == NULL) { - DPRINT1("IntCallWindowsProcA() called with WndProc = NULL!\n"); + DPRINT("IntCallWindowsProcA() called with WndProc = NULL!\n"); return FALSE; }

1 0

[cwittich] 27391: fixed IopLockFileObject
by cwittich＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: cwittich Date: Wed Jul 4 21:05:31 2007 New Revision: 27391 URL: http://svn.reactos.org/svn/reactos?rev=27391&view=rev Log: fixed IopLockFileObject Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h Wed Jul 4 21:05:31 2007 @@ -10,12 +10,13 @@ static __inline IopLockFileObject(IN PFILE_OBJECT FileObject) { - /* Lock the FO and check for contention */ - if (InterlockedExchange((PLONG)&FileObject->Busy, TRUE)) + /* Lock the FO and check for contention */ + InterlockedIncrement((PLONG)&FileObject->Waiters); + while (InterlockedCompareExchange((PLONG)&FileObject->Busy, TRUE, FALSE) != FALSE) { - /* FIXME: Implement contention case */ - KEBUGCHECK(0); + /* FIXME - pause for a little while? */ } + InterlockedDecrement((PLONG)&FileObject->Waiters); } VOID

1 0

[dreimer] 27390: - Add a check if the Source Dir exists. If not, create it to be able to checkout to it. - Try to fix "svn create". (At last it "works" now) Here I need your help. How can I find out if the folder is empty? *.* in a folder is always true when the folder exists....
by dreimer＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: dreimer Date: Wed Jul 4 20:26:39 2007 New Revision: 27390 URL: http://svn.reactos.org/svn/reactos?rev=27390&view=rev Log: - Add a check if the Source Dir exists. If not, create it to be able to checkout to it. - Try to fix "svn create". (At last it "works" now) Here I need your help. How can I find out if the folder is empty? *.* in a folder is always true when the folder exists.... Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Jul 4 20:26:39 2007 @@ -30,6 +30,9 @@ :: Save our initial directory (should be the ReactOS source directory) :: set _ROSSOURCEDIR=%CD% +if not exist "%_ROSSOURCEDIR%\." ( + mkdir %_ROSSOURCEDIR% +) :: :: Check if our log directory exists, if it doesn't, create it. Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Wed Jul 4 20:26:39 2007 @@ -29,12 +29,23 @@ %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% goto :ExitSVN ) +:: +:: Check if the Folder is empty. If not, output an error. +:: + if "%1" == "create" ( title Creating... - if not exist "%_ROSSOURCEDIR%\." ( - mkdir %_ROSSOURCEDIR% + if exist "%_ROSSOURCEDIR%\.svn\." ( + echo Folder already cotains a Reposority. Exiting + goto :ExitSVN + ) + if exist "%_ROSSOURCEDIR%\*" ( + echo Folder is not empty. Continuing is dangerous and can cause errors. + echo Press Strg+C to abort. + pause goto :SVN ) + goto :SVN ) if "%1" == "status" ( title Status @@ -55,20 +66,6 @@ goto :ExitSVN ) -:: -:: Check if the Folder is empty. If not, output an error. -:: -if exist "%_ROSSOURCEDIR%\.svn\." ( - echo Folder already cotains a Reposority. Exiting - goto :ExitSVN -) -if exist "%_ROSSOURCEDIR%\*.*" ( - echo Folder is not empty. Continuing is dangerous and can cause errors. - echo Press Strg+C to abort. - pause - goto :SVN -) - :SVN %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% goto :ExitSVN

1 0

[gedmurphy] 27389: change the name of the VS config from * - Wine headers to * - ReactOS headers
by gedmurphy＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: gedmurphy Date: Wed Jul 4 19:28:56 2007 New Revision: 27389 URL: http://svn.reactos.org/svn/reactos?rev=27389&view=rev Log: change the name of the VS config from * - Wine headers to * - ReactOS headers Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Wed Jul 4 19:28:56 2007 @@ -73,9 +73,9 @@ if (!only_msvc_headers) { - m_configurations.push_back ( new MSVCConfiguration( Debug, WineHeaders )); - m_configurations.push_back ( new MSVCConfiguration( Release, WineHeaders )); - m_configurations.push_back ( new MSVCConfiguration( Speed, WineHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Debug, ReactOSHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Release, ReactOSHeaders )); + m_configurations.push_back ( new MSVCConfiguration( Speed, ReactOSHeaders )); } if ( configuration.CleanAsYouGo ) { Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Wed Jul 4 19:28:56 2007 @@ -42,7 +42,7 @@ enum HeadersType { MSVCHeaders, - WineHeaders + ReactOSHeaders }; class MSVCConfiguration Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Jul 4 19:28:56 2007 @@ -53,7 +53,7 @@ if ( headers == MSVCHeaders ) headers_name = ""; else - headers_name = " - Wine headers"; + headers_name = " - ReactOS headers"; if ( optimization == Debug ) this->name = "Debug" + headers_name; else if ( optimization == Release ) @@ -124,7 +124,7 @@ bool include_idl = false; string vcproj_path = module.GetBasePath(); - vector<string> source_files, resource_files, includes, includes_wine, libraries; + vector<string> source_files, resource_files, includes, includes_ros, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); @@ -179,7 +179,7 @@ !strncmp(incs[i]->directory.c_str(), "include\\psdk", 12 ) || !strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) ) { - includes_wine.push_back ( path ); + includes_ros.push_back ( path ); } else { @@ -304,11 +304,11 @@ fprintf ( OUT, "%s\\include\\reactos\\idl\r\n", intdir.c_str () ); } } - if ( cfg.headers == WineHeaders ) - { - for ( i = 0; i < includes_wine.size(); i++ ) - { - const std::string& include = includes_wine[i]; + if ( cfg.headers == ReactOSHeaders ) + { + for ( i = 0; i < includes_ros.size(); i++ ) + { + const std::string& include = includes_ros[i]; if ( multiple_includes ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() ); @@ -534,11 +534,11 @@ multiple_includes = true; } } - if ( cfg.headers == WineHeaders ) - { - for ( i = 0; i < includes_wine.size(); i++ ) - { - const std::string& include = includes_wine[i]; + if ( cfg.headers == ReactOSHeaders ) + { + for ( i = 0; i < includes_ros.size(); i++ ) + { + const std::string& include = includes_ros[i]; if ( multiple_includes ) fprintf ( OUT, ";" ); fprintf ( OUT, "%s", include.c_str() );

1 0

[weiden] 27388: Don't silently accept entrypoint=""
by weiden＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: weiden Date: Wed Jul 4 19:27:32 2007 New Revision: 27388 URL: http://svn.reactos.org/svn/reactos?rev=27388&view=rev Log: Don't silently accept entrypoint="" Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Jul 4 19:27:32 2007 @@ -339,6 +339,14 @@ att = moduleNode.GetAttribute ( "entrypoint", false ); if ( att != NULL ) { + if ( att->value == "" ) + { + throw InvalidAttributeValueException ( + moduleNode.location, + "entrypoint", + att->value ); + } + entrypoint = att->value; isDefaultEntryPoint = false; }

1 0

[cwittich] 27387: fix loading of comcat.dll
by cwittich＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: cwittich Date: Wed Jul 4 19:25:21 2007 New Revision: 27387 URL: http://svn.reactos.org/svn/reactos?rev=27387&view=rev Log: fix loading of comcat.dll Modified: trunk/reactos/dll/win32/comcat/comcat.rbuild Modified: trunk/reactos/dll/win32/comcat/comcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat.rb… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat.rbuild (original) +++ trunk/reactos/dll/win32/comcat/comcat.rbuild Wed Jul 4 19:25:21 2007 @@ -1,4 +1,4 @@ -<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true"> +<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="comcat.spec.def" /> <include base="comcat">.</include>

1 0

[hpoussin] 27386: Add a message in case of error when loading/initializing driver
by hpoussin＠svn.reactos.org 04 Jul '07

04 Jul '07

Author: hpoussin Date: Wed Jul 4 18:13:30 2007 New Revision: 27386 URL: http://svn.reactos.org/svn/reactos?rev=27386&view=rev Log: Add a message in case of error when loading/initializing driver Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Wed Jul 4 18:13:30 2007 @@ -290,7 +290,7 @@ { if (L'\\' == RemainingPath.Buffer[i]) { - DPRINT1("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); + DPRINT("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jul 4 18:13:30 2007 @@ -2379,45 +2379,55 @@ if (!NT_SUCCESS(Status)) { - /* Driver is not initialized, try to load it */ - Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); - - if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) - { - /* STATUS_IMAGE_ALREADY_LOADED means this driver - was loaded by the bootloader */ - if (Status != STATUS_IMAGE_ALREADY_LOADED) - { - /* Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, - &DeviceNode->ServiceName, FALSE, &DriverObject); - } - else - { - Status = STATUS_SUCCESS; - } - } + /* Driver is not initialized, try to load it */ + Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); + + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) + { + /* STATUS_IMAGE_ALREADY_LOADED means this driver + was loaded by the bootloader */ + if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + /* Initialize the driver */ + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + &DeviceNode->ServiceName, FALSE, &DriverObject); + } + else + { + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", + &DeviceNode->ServiceName, Status); + } } /* Driver is loaded and initialized at this point */ + if (NT_SUCCESS(Status)) + { + /* We have a driver for this DeviceNode */ + DeviceNode->Flags |= DN_DRIVER_LOADED; + /* Attach lower level filter drivers. */ + IopAttachFilterDrivers(DeviceNode, TRUE); + /* Initialize the function driver for the device node */ + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (NT_SUCCESS(Status)) { - /* We have a driver for this DeviceNode */ - DeviceNode->Flags |= DN_DRIVER_LOADED; - /* Attach lower level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, TRUE); - /* Initialize the function driver for the device node */ - Status = IopInitializeDevice(DeviceNode, DriverObject); - - if (NT_SUCCESS(Status)) - { - /* Attach upper level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, FALSE); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - - Status = IopStartDevice(DeviceNode); - } - } + /* Attach upper level filter drivers. */ + IopAttachFilterDrivers(DeviceNode, FALSE); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + + Status = IopStartDevice(DeviceNode); + } + else + { + DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n", + &DeviceNode->InstancePath, Status); + } + } else { /*

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