Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 40893: - CreateFileMapping: SetLastError to ERROR_ALREADY_EXISTS for sections that already exists. SetLastError to ERROR_SUCCESS on success for all API's. More kernel32_winetest fixes for virtual.
by mjmartin＠svn.reactos.org 12 May '09

12 May '09

Author: mjmartin Date: Tue May 12 12:58:38 2009 New Revision: 40893 URL: http://svn.reactos.org/svn/reactos?rev=40893&view=rev Log: - CreateFileMapping: SetLastError to ERROR_ALREADY_EXISTS for sections that already exists. SetLastError to ERROR_SUCCESS on success for all API's. More kernel32_winetest fixes for virtual. Modified: trunk/reactos/dll/win32/kernel32/mem/section.c Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Tue May 12 12:58:38 2009 @@ -138,13 +138,21 @@ flProtect, Attributes, hFile); - if (!NT_SUCCESS(Status)) - { - /* We failed */ - SetLastErrorByStatus(Status); - return NULL; - } - + + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + SetLastError(ERROR_ALREADY_EXISTS); + return SectionHandle; + } + + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + SetLastError(ERROR_SUCCESS); /* Return the section */ return SectionHandle; } @@ -211,6 +219,7 @@ return NULL; } + SetLastError(ERROR_SUCCESS); /* Return the base */ return ViewBase; } @@ -253,6 +262,7 @@ return FALSE; } + SetLastError(ERROR_SUCCESS); /* Otherwise, return sucess */ return TRUE; } @@ -343,6 +353,7 @@ return NULL; } + SetLastError(ERROR_SUCCESS); /* Otherwise, return the handle */ return SectionHandle; } @@ -374,6 +385,7 @@ return FALSE; } + SetLastError(ERROR_SUCCESS); /* Return success */ return TRUE; }

1 0

[jimtabor] 40892: - Remove client thread information from w32 thread information.
by jimtabor＠svn.reactos.org 12 May '09

12 May '09

Author: jimtabor Date: Tue May 12 05:56:39 2009 New Revision: 40892 URL: http://svn.reactos.org/svn/reactos?rev=40892&view=rev Log: - Remove client thread information from w32 thread information. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c 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] Tue May 12 05:56:39 2009 @@ -366,11 +366,7 @@ { PPROCESSINFO ppi; /* [KERNEL] */ PDESKTOPINFO pDeskInfo; -// PVOID DesktopHeapBase; -// ULONG_PTR DesktopHeapLimit; - /* A mask of what hooks are currently active */ ULONG fsHooks; - CLIENTTHREADINFO ClientThreadInfo; } W32THREADINFO, *PW32THREADINFO; /* Window Client Information structure */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue May 12 05:56:39 2009 @@ -44,6 +44,8 @@ UINT cTimersReady; /* Count of timers pending. */ ULONG fsHooks; LIST_ENTRY PtiLink; + + CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -280,11 +280,6 @@ } Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); - if (Win32Thread->ThreadInfo) - { - Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0; -// Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; - } } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -1998,7 +1998,7 @@ { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) { - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook++; + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; return TRUE; } return FALSE; @@ -2009,11 +2009,11 @@ { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook <= 0) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) { return FALSE; } - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook--; + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--; return TRUE; } return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -525,8 +525,7 @@ /* initialize it */ ti->ppi = GetW32ProcessInfo(); ti->fsHooks = W32Thread->fsHooks; -// W32Thread->pcti = &ti->ClientThreadInfo; - W32Thread->pcti = NULL; // FIXME + W32Thread->pcti = &W32Thread->cti; // FIXME if (W32Thread->Desktop != NULL) { ti->pDeskInfo = W32Thread->Desktop->DesktopInfo;

1 0

[jimtabor] 40891: - Move update thread information hooks.
by jimtabor＠svn.reactos.org 12 May '09

12 May '09

Author: jimtabor Date: Tue May 12 05:31:07 2009 New Revision: 40891 URL: http://svn.reactos.org/svn/reactos?rev=40891&view=rev Log: - Move update thread information hooks. Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Tue May 12 05:31:07 2009 @@ -18,7 +18,7 @@ #define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) -#define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->Hooks & HOOKID_TO_FLAG(HookId)) +#define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks & HOOKID_TO_FLAG(HookId)) typedef struct tagHOOKTABLE { Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue May 12 05:31:07 2009 @@ -42,13 +42,13 @@ HANDLE hDesktop; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ + ULONG fsHooks; LIST_ENTRY PtiLink; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; - ULONG Hooks; PW32THREADINFO ThreadInfo; } THREADINFO, *PTHREADINFO; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue May 12 05:31:07 2009 @@ -108,12 +108,12 @@ { W32Thread = ((PTHREADINFO)Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); - W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -222,12 +222,12 @@ W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); - W32Thread->Hooks &= ~HOOKID_TO_FLAG(Hook->HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 12 05:31:07 2009 @@ -524,8 +524,9 @@ /* initialize it */ ti->ppi = GetW32ProcessInfo(); - ti->fsHooks = W32Thread->Hooks; - W32Thread->pcti = &ti->ClientThreadInfo; + ti->fsHooks = W32Thread->fsHooks; +// W32Thread->pcti = &ti->ClientThreadInfo; + W32Thread->pcti = NULL; // FIXME if (W32Thread->Desktop != NULL) { ti->pDeskInfo = W32Thread->Desktop->DesktopInfo;

1 0

[dgoette] 414: import favicon
by dgoette＠svn.reactos.org 11 May '09

11 May '09

Author: dgoette Date: Tue May 12 01:54:29 2009 New Revision: 414 URL: http://svn.reactos.org/svn/reactos?rev=414&view=rev Log: import favicon Added: branches/danny-web/www/www.reactos.org/favicon.ico (with props) Added: branches/danny-web/www/www.reactos.org/favicon.ico URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/f… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/favicon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[dgoette] 413: implement a hack for adding dependencies of dynamic pages
by dgoette＠svn.reactos.org 11 May '09

11 May '09

Author: dgoette Date: Tue May 12 01:48:51 2009 New Revision: 413 URL: http://svn.reactos.org/svn/reactos?rev=413&view=rev Log: implement a hack for adding dependencies of dynamic pages Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] Tue May 12 01:48:51 2009 @@ -283,6 +283,37 @@ return false; } + // @HACK + if (1) { + $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_ENTRIES." WHERE id=:data_id"); + $stmt->bindParam('data_id',$revision['data_id'],PDO::PARAM_INT); + $stmt->execute(); + $name = $stmt->fetchColumn(); + + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.name = :name AND d.type='dynamic' AND r.archive IS FALSE AND r.status = 'stable' ORDER BY r.datetime DESC LIMIT 1"); + if (strpos($name,'newsletter_') === 0) { + $stmt->bindValue('name','newsletter',PDO::PARAM_STR); + } + elseif (strpos($name,'news_page_') === 0) { + $stmt->bindValue('name','news_page',PDO::PARAM_STR); + } + elseif (strpos($name,'interview_') === 0) { + $stmt->bindValue('name','interview',PDO::PARAM_STR); + } + elseif (strpos($name,'blog_') === 0) { + $stmt->bindValue('name','blog',PDO::PARAM_STR); + } + else { + $stmt=null; + } + + if ($stmt !== null) { + $stmt->execute(); + $data = $stmt->fetchColumn(); + Dependencies::addManual($data,$name,'content'); + } + } // HACK END + // make entry stable Revision::setStatus($revision['id'],'stable');

1 0

[dreimer] 40890: ook. I don't understand why I need this twice. Well, But now it works.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Tue May 12 01:15:02 2009 New Revision: 40890 URL: http://svn.reactos.org/svn/reactos?rev=40890&view=rev Log: ook. I don't understand why I need this twice. Well, But now it works. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.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 May 12 01:15:02 2009 @@ -90,11 +90,11 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} 2>&1 | tee-object $file + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file $sw.Stop() } else { $sw.Start() - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) $sw.Stop() } write-host "Total Build Time:" $sw.Elapsed.ToString()

1 0

[dreimer] 40889: Circumvent another Batch silliness with a if block and some code not be parsed in a row problem... thx to Colin for the suggestion to fix it this way
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 23:06:15 2009 New Revision: 40889 URL: http://svn.reactos.org/svn/reactos?rev=40889&view=rev Log: Circumvent another Batch silliness with a if block and some code not be parsed in a row problem... thx to Colin for the suggestion to fix it this way Added: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd (with props) trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Added: 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 (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd [iso-8859-1] Mon May 11 23:06:15 2009 @@ -1,0 +1,24 @@ +:: +:: 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 Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon May 11 23:06:15 2009 @@ -1,0 +1,65 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/Build-Shared.cmd +:: PURPOSE: Perform the build of ReactOS. +:: 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 +) + +:: Check if config.template.rbuild is newer than config.rbuild, if it is then +:: abort the build and inform the user. +if exist .\config.rbuild ( + "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild + if !errorlevel! == 1 ( + echo. + echo *** config.template.rbuild is newer than config.rbuild *** + echo *** aborting build. Please check for changes and *** + echo *** update your config.rbuild. *** + echo. + goto :EOC + ) +) + +call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" + +if "%_ROSBE_USECCACHE%" == "1" ( + set _ROSBE_CCACHE=ccache +) else ( + set _ROSBE_CCACHE= +) + +set HOST_CC=%_ROSBE_CCACHE%gcc +set HOST_CPP=%_ROSBE_CCACHE%g++ +set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc +set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++ + +:: Get the current date and time for use in in our build log's file name. +call "%_ROSBE_BASEDIR%\TimeDate.cmd" + +title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) + +:: Do the actual building +if %_ROSBE_SHOWTIME% == 1 ( + set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" +) else ( + set BUILDTIME_COMMAND= +) + +if %_ROSBE_WRITELOG% == 1 ( + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" +) else ( + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* +) + +:EOC +:: Highlight the fact that building has ended. +"%_ROSBE_BASEDIR%\Tools\flash.exe" +title ReactOS Build Environment %_ROSBE_VERSION% Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] Mon May 11 23:06:15 2009 @@ -2,7 +2,7 @@ :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build.cmd -:: PURPOSE: Perform the build of ReactOS. +:: 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> @@ -16,63 +16,9 @@ setlocal enabledelayedexpansion -:: Check if config.template.rbuild is newer than config.rbuild, if it is then -:: abort the build and inform the user. -if exist .\config.rbuild ( - "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild - if !errorlevel! == 1 ( - echo. - echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** - echo. - goto :EOC - ) -) +:: Set the options for a uniprocessor build +set MAKE_JOBS=1 +set TITLE_COMMAND=make %* -call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" - -if "%_ROSBE_USECCACHE%" == "1" ( - set _ROSBE_CCACHE=ccache -) else ( - set _ROSBE_CCACHE= -) - -set HOST_CC=%_ROSBE_CCACHE%gcc -set HOST_CPP=%_ROSBE_CCACHE%g++ -set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc -set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++ - -:: Get the current date and time for use in in our build log's file name. -call "%_ROSBE_BASEDIR%\TimeDate.cmd" - -:: Check whether we were called as "makex" or "make" -if "%1" == "multi" ( - shift - set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% - set TITLE_COMMAND=makex %2%3%4%5%6%7%8%9 -) else ( - set MAKE_JOBS=1 - set TITLE_COMMAND=make %* -) - -title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) - -:: Do the actual building -if %_ROSBE_SHOWTIME% == 1 ( - set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" -) else ( - set BUILDTIME_COMMAND= -) - -if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" -) else ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 -) - -:EOC -:: Highlight the fact that building has ended. -"%_ROSBE_BASEDIR%\Tools\flash.exe" -title ReactOS Build Environment %_ROSBE_VERSION% +call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* endlocal Modified: 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 [iso-8859-1] Mon May 11 23:06:15 2009 @@ -7,7 +7,7 @@ ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* +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" $* Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon May 11 23:06:15 2009 @@ -131,6 +131,8 @@ WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" ${else} File /r Root\Build.cmd + File /r Root\Build-Multi.cmd + File /r Root\Build-Shared.cmd File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd @@ -297,6 +299,8 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Root\Build.cmd + File /r Root\Build-Multi.cmd + File /r Root\Build-Shared.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd @@ -447,6 +451,8 @@ RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" Delete /REBOOTOK "$INSTDIR\Build.cmd" + Delete /REBOOTOK "$INSTDIR\Build-Multi.cmd" + Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.ps1"

1 0

[dreimer] 40888: if ($global:var -eq $null) { "buildno.h not found y00 n00b!!!111" } Now fixed :-D
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 22:26:47 2009 New Revision: 40888 URL: http://svn.reactos.org/svn/reactos?rev=40888&view=rev Log: if ($global:var -eq $null) { "buildno.h not found y00 n00b!!!111" } Now fixed :-D Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 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] Mon May 11 22:26:47 2009 @@ -38,8 +38,6 @@ $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" -$global:_ROSBE_OBJPATH = $null -$global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" $global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"

1 0

[dreimer] 40887: Fix support for commands like: "make bootcd livecd install" Fix tee command in PS
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 22:01:29 2009 New Revision: 40887 URL: http://svn.reactos.org/svn/reactos?rev=40887&view=rev Log: Fix support for commands like: "make bootcd livecd install" Fix tee command in PS Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd 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] Mon May 11 22:01:29 2009 @@ -90,11 +90,11 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object $file + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} 2>&1 | tee-object $file $sw.Stop() } else { $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $sw.Stop() } write-host "Total Build Time:" $sw.Elapsed.ToString() Modified: 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 [iso-8859-1] Mon May 11 22:01:29 2009 @@ -50,10 +50,10 @@ if "%1" == "multi" ( shift set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% - set TITLE_COMMAND=makex %2 + set TITLE_COMMAND=makex %2%3%4%5%6%7%8%9 ) else ( set MAKE_JOBS=1 - set TITLE_COMMAND=make %1 + set TITLE_COMMAND=make %* ) title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) @@ -66,9 +66,9 @@ ) if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 ) :EOC

1 0

[janderwald] 40886: - Use ExInterlockedList * functions for speed and stability - Increment reference count on the correct miniport adapter from IPortDMus
by janderwald＠svn.reactos.org 11 May '09

11 May '09

Author: janderwald Date: Mon May 11 21:22:27 2009 New Revision: 40886 URL: http://svn.reactos.org/svn/reactos?rev=40886&view=rev Log: - Use ExInterlockedList * functions for speed and stability - Increment reference count on the correct miniport adapter from IPortDMus Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Mon May 11 21:22:27 2009 @@ -231,6 +231,7 @@ IN PVOID Tag); STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); + STDMETHOD_(VOID, PrintQueueStatus)(THIS); }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -11,12 +11,13 @@ typedef struct _IRP_MAPPING_ { LIST_ENTRY Entry; - KSSTREAM_HEADER *Header; + PVOID Buffer; + ULONG BufferSize; + ULONG OriginalBufferSize; + PVOID OriginalBuffer; PIRP Irp; - ULONG References; - ULONG NumTags; - PVOID * Tag; + PVOID Tag; }IRP_MAPPING, *PIRP_MAPPING; typedef struct @@ -34,6 +35,7 @@ KSPIN_LOCK Lock; LIST_ENTRY ListHead; + LIST_ENTRY FreeHead; ULONG OutOfMapping; ULONG MaxFrameSize; @@ -49,18 +51,15 @@ if (CurMapping->Irp) { - CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent; + CurMapping->Irp->IoStatus.Information = CurMapping->OriginalBufferSize; CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); } - if (CurMapping->Tag) - { - FreeItem(CurMapping->Tag, TAG_PORTCLASS); - } - - ExFreePool(CurMapping->Header->Data); - ExFreePool(CurMapping->Header); + if (CurMapping->OriginalBuffer) + { + ExFreePool(CurMapping->OriginalBuffer); + } ExFreePool(CurMapping); } @@ -128,6 +127,7 @@ This->MaxFrameSize = FrameSize; InitializeListHead(&This->ListHead); + InitializeListHead(&This->FreeHead); KeInitializeSpinLock(&This->Lock); return STATUS_SUCCESS; @@ -141,58 +141,76 @@ IN ULONG BufferSize, IN PIRP Irp) { - PIRP_MAPPING Mapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); - if (!Mapping) - return STATUS_UNSUCCESSFUL; - - Mapping->Header = (KSSTREAM_HEADER*)Buffer; - Mapping->Irp = Irp; + PIRP_MAPPING Mapping = NULL; + KSSTREAM_HEADER * Header = (KSSTREAM_HEADER*)Buffer; + ULONG Index, NumMappings, Offset; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + if (This->MaxFrameSize) { - if (This->MaxFrameSize > Mapping->Header->DataUsed) + if (This->MaxFrameSize > Header->DataUsed) { /* small mapping */ - Mapping->NumTags = 1; + NumMappings = 1; } else { - ULONG Rest = Mapping->Header->DataUsed % This->MaxFrameSize; - - Mapping->NumTags = Mapping->Header->DataUsed / This->MaxFrameSize; + ULONG Rest = Header->DataUsed % This->MaxFrameSize; + + NumMappings = Header->DataUsed / This->MaxFrameSize; if (Rest) { - Mapping->NumTags++; + NumMappings++; } } } else { /* no framesize restriction */ - Mapping->NumTags = 1; - } - - Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); - if (!Mapping->Tag) - { - FreeItem(Mapping, TAG_PORTCLASS); - return STATUS_UNSUCCESSFUL; - } - ASSERT(Mapping->NumTags < 32); - Mapping->References = (1 << Mapping->NumTags) - 1; - - This->NumDataAvailable += Mapping->Header->DataUsed; - - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p NumTags %u References %x FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->NumTags, Mapping->References, This->MaxFrameSize); - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - InsertTailList(&This->ListHead, &Mapping->Entry); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - - (void)InterlockedIncrement((volatile long*)&This->NumMappings); + NumMappings = 1; + } + + for(Index = 0; Index < NumMappings; Index++) + { + Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); + if (!Mapping) + { + DPRINT("OutOfMemory\n"); + return STATUS_UNSUCCESSFUL; + } + + if (Index) + Offset = Index * This->MaxFrameSize; + else + Offset = 0; + + Mapping->Buffer = (PVOID)UlongToPtr(PtrToUlong(Header->Data) + Offset); + + if (This->MaxFrameSize) + Mapping->BufferSize = min(Header->DataUsed - Offset, This->MaxFrameSize); + else + Mapping->BufferSize = Header->DataUsed; + + Mapping->OriginalBufferSize = Header->FrameExtent; + Mapping->OriginalBuffer = NULL; + Mapping->Irp = NULL; + Mapping->Tag = NULL; + + This->NumDataAvailable += Mapping->BufferSize; + + if (Index == NumMappings - 1) + { + /* last mapping should free the irp if provided */ + Mapping->OriginalBuffer = Header->Data; + Mapping->Irp = Irp; + } + + ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); + (void)InterlockedIncrement((volatile long*)&This->NumMappings); + + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p FrameSize %u\n", This->NumMappings, Mapping->BufferSize, This->NumDataAvailable, Mapping, This->MaxFrameSize); + } if (Irp) { @@ -216,23 +234,20 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; PLIST_ENTRY CurEntry; - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - - CurEntry = This->ListHead.Flink; - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + if (!CurEntry) + { + This->StartStream = FALSE; This->OutOfMapping = TRUE; return STATUS_UNSUCCESSFUL; } - *Buffer = (PUCHAR)CurMapping->Header->Data + This->CurrentOffset; - *BufferSize = CurMapping->Header->DataUsed - This->CurrentOffset; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + *Buffer = (PUCHAR)CurMapping->Buffer + This->CurrentOffset; + *BufferSize = CurMapping->BufferSize - This->CurrentOffset; + ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); This->OutOfMapping = FALSE; - KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } @@ -248,24 +263,22 @@ PIRP_MAPPING CurMapping; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + This->CurrentOffset += BytesWritten; This->NumDataAvailable -= BytesWritten; - CurEntry = This->ListHead.Flink; - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - - if (CurMapping->Header->DataUsed <= This->CurrentOffset) + if (CurMapping->BufferSize <= This->CurrentOffset) { This->CurrentOffset = 0; - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - RemoveHeadList(&This->ListHead); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - InterlockedDecrement(&This->NumMappings); FreeMappingRoutine(CurMapping); } - + else + { + ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); + } } ULONG @@ -331,51 +344,6 @@ This->StartStream = FALSE; } - -VOID -GetMapping( - IIrpQueueImpl * This, - IN ULONG Index, - IN PVOID Tag, - IN PIRP_MAPPING CurMapping, - OUT PPHYSICAL_ADDRESS PhysicalAddress, - OUT PVOID *VirtualAddress, - OUT PULONG ByteCount, - OUT PULONG Flags) -{ - ULONG Offset; - - /* calculate the offset */ - if (Index) - Offset = Index * This->MaxFrameSize; - else - Offset = 0; - - ASSERT(CurMapping->Header->DataUsed > Offset); - - *VirtualAddress = (PUCHAR)CurMapping->Header->Data + Offset; - *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); - /* FIXME alignment */ - *ByteCount = min(CurMapping->Header->DataUsed - Offset, This->MaxFrameSize); - - /* reset out of mapping indicator */ - This->OutOfMapping = FALSE; - - /* decrement available byte counter */ - This->NumDataAvailable -= *ByteCount; - - /* store the tag */ - CurMapping->Tag[Index] = Tag; - - if (Index + 1 == CurMapping->NumTags) - { - /* indicate end of packet */ - *Flags = 1; - } - - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p Index %u NumTags %u\n", Tag, CurMapping, Index, CurMapping->NumTags); -} - NTSTATUS NTAPI @@ -389,45 +357,47 @@ { PIRP_MAPPING CurMapping; PLIST_ENTRY CurEntry; - ULONG Index; - ULONG Value; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; ASSERT(Tag != NULL); - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); + + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + if (!CurEntry) + { This->OutOfMapping = TRUE; This->StartStream = FALSE; return STATUS_UNSUCCESSFUL; } - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - for(Index = 0; Index < CurMapping->NumTags; Index++) - { - Value = CurMapping->References & ( 1 << Index); - if (CurMapping->Tag[Index] == NULL && Value) - { - /* found a free mapping within audio irp */ - GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; - } - } - CurEntry = CurEntry->Flink; - } - KeReleaseSpinLockFromDpcLevel(&This->Lock); - This->OutOfMapping = TRUE; - This->StartStream = FALSE; - DPRINT("No Mapping available\n"); - return STATUS_UNSUCCESSFUL; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + + *PhysicalAddress = MmGetPhysicalAddress(CurMapping->Buffer); + *VirtualAddress = CurMapping->Buffer; + *ByteCount = CurMapping->BufferSize; + + InterlockedDecrement(&This->NumMappings); + This->NumDataAvailable -= CurMapping->BufferSize; + + if (CurMapping->OriginalBuffer) + { + /* last partial buffer */ + *Flags = 1; + + /* store tag */ + CurMapping->Tag = Tag; + + /* insert into list to free later */ + ExInterlockedInsertTailList(&This->FreeHead, &CurMapping->Entry, &This->Lock); + } + else + { + /* we can free this entry now */ + FreeItem(CurMapping, TAG_PORTCLASS); + } + DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p\n", Tag); + return STATUS_SUCCESS; } NTSTATUS @@ -438,62 +408,28 @@ { PIRP_MAPPING CurMapping = NULL; PLIST_ENTRY CurEntry; - ULONG Index = 0; - ULONG Found; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_UNSUCCESSFUL; - } - - Found = FALSE; - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - for(Index = 0; Index < CurMapping->NumTags; Index++) - { - if (CurMapping->Tag[Index] == Tag) - { - Found = TRUE; - CurMapping->Tag[Index] = NULL; - break; - } - } - if (Found) - break; - - CurEntry = CurEntry->Flink; - } - - if (!Found) - { - DPRINT1("Tag %p not found\n", Tag); - ASSERT(Found); - } - DPRINT("References %x\n", CurMapping->References); - CurMapping->References &= ~(1 << Index); - - if (CurMapping->References) - { - /* released mapping is not the last mapping of the irp */ - DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags %u Refs %x\n", Tag, Index, CurMapping->NumTags, CurMapping->References); - KeReleaseSpinLockFromDpcLevel(&This->Lock); + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag); + + CurEntry = ExInterlockedRemoveHeadList(&This->FreeHead, &This->Lock); + if (!CurMapping) + { return STATUS_SUCCESS; } - RemoveEntryList(&CurMapping->Entry); + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + if (CurMapping->Tag != Tag) + { + /* the released mapping is not the last one */ + ExInterlockedInsertHeadList(&This->FreeHead, &CurMapping->Entry, &This->Lock); + return STATUS_SUCCESS; + } /* last mapping of the irp, free irp */ - DPRINT("Freeing mapping %p\n", CurMapping); - InterlockedDecrement(&This->NumMappings); + DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); + FreeMappingRoutine(CurMapping); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; } @@ -505,6 +441,32 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; return This->OutOfMapping; } + +VOID +NTAPI +IIrpQueue_fnPrintQueueStatus( + IN IIrpQueue *iface) +{ + PIRP_MAPPING CurMapping = NULL; + PLIST_ENTRY CurEntry; + + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + KeAcquireSpinLockAtDpcLevel(&This->Lock); + + CurEntry = This->ListHead.Flink; + DPRINT("IIrpQueue_fnPrintQueueStatus % u ===============\n", This->NumMappings); + + while (CurEntry != &This->ListHead) + { + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + DPRINT("Mapping %p Size %u Original %p\n", CurMapping, CurMapping->BufferSize, CurMapping->OriginalBuffer); + CurEntry = CurEntry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&This->Lock); + DPRINT("IIrpQueue_fnPrintQueueStatus ===============\n"); +} + static IIrpQueueVtbl vt_IIrpQueue = { @@ -522,7 +484,8 @@ IIrpQueue_fnUpdateFormat, IIrpQueue_fnGetMappingWithTag, IIrpQueue_fnReleaseMappingWithTag, - IIrpQueue_fnHasLastMappingFailed + IIrpQueue_fnHasLastMappingFailed, + IIrpQueue_fnPrintQueueStatus }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -207,6 +207,10 @@ Miniport->lpVtbl->Release(Miniport); return Status; } + + /* increment reference on miniport adapter */ + Miniport->lpVtbl->AddRef(Miniport); + } else { @@ -226,6 +230,9 @@ MidiMiniport->lpVtbl->Release(MidiMiniport); return Status; } + + /* increment reference on miniport adapter */ + MidiMiniport->lpVtbl->AddRef(MidiMiniport); } /* create the subdevice descriptor */ @@ -265,10 +272,6 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); - - /* check if it supports IPinCount interface */ Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -504,7 +504,6 @@ PIO_STACK_LOCATION IoStack; ISubdevice * SubDevice; PPCLASS_DEVICE_EXTENSION DeviceExt; - SUBDEVICE_ENTRY * Entry; IIrpTarget *Filter; PKSOBJECT_CREATE_ITEM CreateItem; PPIN_WORKER_CONTEXT Context; @@ -526,13 +525,6 @@ { DPRINT1("PcCreateItemDispatch SubDevice %p DeviceExt %p\n", SubDevice, DeviceExt); return STATUS_UNSUCCESSFUL; - } - - Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); - if (!Entry) - { - DPRINT1("PcCreateItemDispatch no memory\n"); - return STATUS_INSUFFICIENT_RESOURCES; } #if KS_IMPLEMENTED

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