Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 40195: Prettify output a bit in case we have no search results :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Mar 24 01:28:33 2009 New Revision: 40195 URL: http://svn.reactos.org/svn/reactos?rev=40195&view=rev Log: Prettify output a bit in case we have no search results :-) Modified: branches/danny-web/reactos.org/htdocs/testman/js/index.js.php Modified: branches/danny-web/reactos.org/htdocs/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] Tue Mar 24 01:28:33 2009 @@ -294,7 +294,7 @@ if(!results.length) { - html += '<tr class="even"><td colspan="5"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; + html += '<tr class="even"><td colspan="6"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; } else {

16 years, 3 months

[cfinck] 40194: Update the testman SQL file

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Mar 24 01:24:26 2009 New Revision: 40194 URL: http://svn.reactos.org/svn/reactos?rev=40194&view=rev Log: Update the testman SQL file Modified: branches/danny-web/reactos.org/resources/testman/testman.sql Modified: branches/danny-web/reactos.org/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/resources… ============================================================================== --- branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/resources/testman/testman.sql [iso-8859-1] Tue Mar 24 01:24:26 2009 @@ -10,7 +10,7 @@ `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, `log` longtext collate latin1_general_ci NOT NULL, - `count` int(10) unsigned NOT NULL COMMENT 'Number of all executed tests', + `count` int(10) NOT NULL COMMENT 'Number of all executed tests', `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', @@ -24,6 +24,7 @@ `user_id` bigint(20) unsigned NOT NULL, `revision` int(9) unsigned NOT NULL, `platform` varchar(24) collate latin1_general_ci NOT NULL, + `comment` varchar(255) collate latin1_general_ci default NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

16 years, 3 months

[cfinck] 40193: Temporarily add cookie_domain() to "subsys_layout.php" to avoid including non-existent RosCMS v3 components till we have a complete RosCMS 4 solution for this

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Mar 24 01:05:52 2009 New Revision: 40193 URL: http://svn.reactos.org/svn/reactos?rev=40193&view=rev Log: Temporarily add cookie_domain() to "subsys_layout.php" to avoid including non-existent RosCMS v3 components till we have a complete RosCMS 4 solution for this Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/sh… ============================================================================== --- branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Tue Mar 24 01:05:52 2009 @@ -6,8 +6,25 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once(ROSCMS_PATH . "inc/utils.php"); - + /* + * This will return the last two components of the server name, with a leading + * dot (i.e. usually .reactos.com or .reactos.org for us). See the PHP docs + * on setcookie() why we need the leading dot. + */ + function cookie_domain() + { + /* Server name might be just an IP address */ + if(preg_match("#[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#", $_SERVER["SERVER_NAME"])) + return $_SERVER["SERVER_NAME"]; + + /* If it' a DNS address, return the domain name along with the suffix */ + if(preg_match("#(\.[^.]+\.[^.]+$)#", $_SERVER["SERVER_NAME"], $matches)) + return $matches[1]; + + /* Otherwise return nothing */ + return ""; + } + function GetLanguage() { global $lang;

16 years, 3 months

[spetreolle] 40192: setupapi.CMP_RegisterNotification is not a stub anymore, update cfgmgr32.spec accordingly.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Mar 24 01:01:40 2009 New Revision: 40192 URL: http://svn.reactos.org/svn/reactos?rev=40192&view=rev Log: setupapi.CMP_RegisterNotification is not a stub anymore, update cfgmgr32.spec accordingly. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Tue Mar 24 01:01:40 2009 @@ -1,5 +1,5 @@ @ stdcall CMP_Init_Detection(long) setupapi.CMP_Init_Detection -@ stub CMP_RegisterNotification # setupapi.CMP_RegisterNotification +@ stdcall CMP_RegisterNotification(ptr ptr long ptr) setupapi.CMP_RegisterNotification @ stdcall CMP_Report_LogOn(long long) setupapi.CMP_Report_LogOn @ stub CMP_UnregisterNotification # setupapi.CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Tue Mar 24 01:01:40 2009 @@ -2,7 +2,7 @@ @ stub CMP_GetBlockedDriverInfo @ stub CMP_GetServerSideDeviceInstallFlags @ stdcall CMP_Init_Detection(long) -@ stdcall CMP_RegisterNotification( ptr ptr long ptr) +@ stdcall CMP_RegisterNotification(ptr ptr long ptr) @ stdcall CMP_Report_LogOn(long long) @ stub CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long)

16 years, 3 months

[jmorlan] 40191: Implement %~$PATH:var variable substitution

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Mar 23 22:54:52 2009 New Revision: 40191 URL: http://svn.reactos.org/svn/reactos?rev=40191&view=rev Log: Implement %~$PATH:var variable substitution Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Mar 23 22:54:52 2009 @@ -891,8 +891,8 @@ } #define GrowIfNecessary(x, y, z) GrowIfNecessary_dbg(x, y, z, __FILE__, __LINE__) -LPCTSTR -GetEnvVarOrSpecial ( LPCTSTR varName ) +LPTSTR +GetEnvVar(LPCTSTR varName) { static LPTSTR ret = NULL; static UINT retlen = 0; @@ -907,20 +907,23 @@ } if ( size ) return ret; + return NULL; +} + +LPCTSTR +GetEnvVarOrSpecial(LPCTSTR varName) +{ + static TCHAR ret[MAX_PATH]; + + LPTSTR var = GetEnvVar(varName); + if (var) + return var; /* env var doesn't exist, look for a "special" one */ /* %CD% */ if (_tcsicmp(varName,_T("cd")) ==0) { - size = GetCurrentDirectory ( retlen, ret ); - if ( size > retlen ) - { - if ( !GrowIfNecessary ( size, &ret, &retlen ) ) - return NULL; - size = GetCurrentDirectory ( retlen, ret ); - } - if ( !size ) - return NULL; + GetCurrentDirectory(MAX_PATH, ret); return ret; } /* %TIME% */ @@ -937,8 +940,6 @@ /* %RANDOM% */ else if (_tcsicmp(varName,_T("random")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; /* Get random number */ _itot(rand(),ret,10); return ret; @@ -953,8 +954,6 @@ /* %CMDEXTVERSION% */ else if (_tcsicmp(varName,_T("cmdextversion")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; /* Set version number to 2 */ _itot(2,ret,10); return ret; @@ -963,8 +962,6 @@ /* %ERRORLEVEL% */ else if (_tcsicmp(varName,_T("errorlevel")) ==0) { - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; _itot(nErrorLevel,ret,10); return ret; } @@ -990,6 +987,7 @@ } Modifiers = 0; TCHAR *Format, *FormatEnd; + TCHAR *PathVarName = NULL; LPTSTR Variable; TCHAR *VarEnd; BOOL VariableIsParam0; @@ -1011,17 +1009,31 @@ while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) FormatEnd++; - /* TODO: check for $PATH: syntax */ - - /* Now backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) - { - if (FormatEnd == Format) + if (*FormatEnd == _T('$')) + { + /* $PATH: syntax */ + PathVarName = FormatEnd + 1; + FormatEnd = _tcschr(PathVarName, _T(':')); + if (!FormatEnd) return NULL; - FormatEnd--; - } - - for (; Format < FormatEnd; Format++) + + /* Must be immediately followed by the variable */ + Variable = GetVar(*++FormatEnd, &VariableIsParam0); + if (!Variable) + return NULL; + } + else + { + /* Backtrack if necessary to get a variable name match */ + while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + { + if (FormatEnd == Format) + return NULL; + FormatEnd--; + } + } + + for (; Format < FormatEnd && *Format != _T('$'); Format++) Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); *pFormat = FormatEnd + 1; @@ -1040,11 +1052,26 @@ memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); Result[VarEnd - Variable] = _T('\0'); - /* For plain %~var with no modifiers, just return the variable without quotes */ - if (Modifiers == 0) + if (PathVarName) + { + /* $PATH: syntax - search the directories listed in the + * specified environment variable for the file */ + LPTSTR PathVar; + FormatEnd[-1] = _T('\0'); + PathVar = GetEnvVar(PathVarName); + FormatEnd[-1] = _T(':'); + if (!PathVar || + !SearchPath(PathVar, Result, NULL, MAX_PATH, FullPath, NULL)) + { + return _T(""); + } + } + else if (Modifiers == 0) + { + /* For plain %~var with no modifiers, just return the variable without quotes */ return Result; - - if (VariableIsParam0) + } + else if (VariableIsParam0) { /* Special case: If the variable is %0 and modifier characters are present, * use the batch file's path (which includes the .bat/.cmd extension) @@ -1141,6 +1168,7 @@ Out += FormatDate(Out, &st, TRUE); *Out++ = _T(' '); Out += FormatTime(Out, &st); + *Out++ = _T(' '); } if (Modifiers & M_SIZE) { @@ -1151,25 +1179,32 @@ } } + /* When using the path-searching syntax or the S modifier, + * at least part of the file path is always included. + * If none of the DPNX modifiers are present, include the full path */ + if (PathVarName || (Modifiers & M_SHORT)) + if ((Modifiers & (M_DRIVE | M_PATH | M_NAME | M_EXT)) == 0) + Modifiers |= M_FULL; + /* Now add the requested parts of the name. - * With the F or S modifiers, add all parts to form the full path. */ + * With the F modifier, add all parts to form the full path. */ Extension = _tcsrchr(Filename, _T('.')); - if (Modifiers & (M_DRIVE | M_FULL | M_SHORT)) + if (Modifiers & (M_DRIVE | M_FULL)) { *Out++ = FixedPath[0]; *Out++ = FixedPath[1]; } - if (Modifiers & (M_PATH | M_FULL | M_SHORT)) + if (Modifiers & (M_PATH | M_FULL)) { memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); Out += Filename - &FixedPath[2]; } - if (Modifiers & (M_NAME | M_FULL | M_SHORT)) + if (Modifiers & (M_NAME | M_FULL)) { while (*Filename && Filename != Extension) *Out++ = *Filename++; } - if (Modifiers & (M_EXT | M_FULL | M_SHORT)) + if (Modifiers & (M_EXT | M_FULL)) { if (Extension) Out = _stpcpy(Out, Extension);

16 years, 4 months

[arty] 40190: Actually mark irp pending.

by arty＠svn.reactos.org

Author: arty Date: Mon Mar 23 22:45:21 2009 New Revision: 40190 URL: http://svn.reactos.org/svn/reactos?rev=40190&view=rev Log: Actually mark irp pending. Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Mar 23 22:45:21 2009 @@ -321,5 +321,7 @@ NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { InsertTailList( &FCB->PendingIrpList[Function], &Irp->Tail.Overlay.ListEntry ); + IoMarkIrpPending(Irp); + Irp->IoStatus.Status = STATUS_PENDING; return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0, NULL ); }

16 years, 4 months

[tkreuzer] 40189: GDIOBJ_ShareUnlockObjByPtr: Temporarily don't ASSERT, but print a backtrace when trying to unlock an object that wasn't locked.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 23 22:11:37 2009 New Revision: 40189 URL: http://svn.reactos.org/svn/reactos?rev=40189&view=rev Log: GDIOBJ_ShareUnlockObjByPtr: Temporarily don't ASSERT, but print a backtrace when trying to unlock an object that wasn't locked. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Mon Mar 23 22:11:37 2009 @@ -104,7 +104,13 @@ GDIOBJ_ShareUnlockObjByPtr(POBJ Object) { INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); - ASSERT(cLocks >= 0); +// ASSERT(cLocks >= 0); + if (cLocks < 0) + { + DbgPrint("Unlocked object %p, that was not locked!\n", Object->hHmgr); + KdSystemDebugControl(TAG('R', 'o', 's', 'D'), NULL, 20, NULL, 0, NULL, KernelMode); + InterlockedIncrement((PLONG)&Object->ulShareCount); + } return cLocks; }

16 years, 4 months

[arty] 40188: Formatting only, no change.

by arty＠svn.reactos.org

Author: arty Date: Mon Mar 23 21:13:17 2009 New Revision: 40188 URL: http://svn.reactos.org/svn/reactos?rev=40188&view=rev Log: Formatting only, no change. Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Mar 23 21:13:17 2009 @@ -43,18 +43,18 @@ } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, - PAFD_RECV_INFO RecvReq, - PUINT TotalBytesCopied ) { + PAFD_RECV_INFO RecvReq, + PUINT TotalBytesCopied ) { UINT i, BytesToCopy = 0, - BytesAvailable = - FCB->Recv.Content - FCB->Recv.BytesUsed; + BytesAvailable = + FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map; NTSTATUS Status; *TotalBytesCopied = 0; AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", - BytesAvailable)); + BytesAvailable)); if( CantReadMore(FCB) ) return STATUS_SUCCESS; if( !BytesAvailable ) return STATUS_PENDING; @@ -62,29 +62,29 @@ Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); AFD_DbgPrint(MID_TRACE,("Buffer Count: %d @ %x\n", - RecvReq->BufferCount, - RecvReq->BufferArray)); + RecvReq->BufferCount, + RecvReq->BufferArray)); for( i = 0; - RecvReq->BufferArray && - BytesAvailable && - i < RecvReq->BufferCount; - i++ ) { - BytesToCopy = - MIN( RecvReq->BufferArray[i].len, BytesAvailable ); - - if( Map[i].Mdl ) { - Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", - i, - Map[i].BufferAddress, - BytesToCopy)); - - RtlCopyMemory( Map[i].BufferAddress, - FCB->Recv.Window + FCB->Recv.BytesUsed, - BytesToCopy ); - - MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); + RecvReq->BufferArray && + BytesAvailable && + i < RecvReq->BufferCount; + i++ ) { + BytesToCopy = + MIN( RecvReq->BufferArray[i].len, BytesAvailable ); + + if( Map[i].Mdl ) { + Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", + i, + Map[i].BufferAddress, + BytesToCopy)); + + RtlCopyMemory( Map[i].BufferAddress, + FCB->Recv.Window + FCB->Recv.BytesUsed, + BytesToCopy ); + + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); *TotalBytesCopied += BytesToCopy; @@ -92,31 +92,31 @@ FCB->Recv.BytesUsed += BytesToCopy; BytesAvailable -= BytesToCopy; } - } + } } /* If there's nothing left in our buffer start a new request */ if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { - FCB->Recv.BytesUsed = FCB->Recv.Content = 0; + FCB->Recv.BytesUsed = FCB->Recv.Content = 0; FCB->PollState &= ~AFD_EVENT_RECEIVE; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - if( !FCB->ReceiveIrp.InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + if( !FCB->ReceiveIrp.InFlightRequest ) { + AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); + + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); if( Status == STATUS_SUCCESS ) FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; HandleEOFOnIrp( FCB, Status, FCB->ReceiveIrp.Iosb.Information ); - } + } } return STATUS_SUCCESS; @@ -159,53 +159,53 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); } } else { - /* Kick the user that receive would be possible now */ - /* XXX Not implemented yet */ - - AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", - FCB, FCB->Recv.Content)); - /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ - - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer + ( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - } } if( FCB->Recv.Content ) { - FCB->PollState |= AFD_EVENT_RECEIVE; + FCB->PollState |= AFD_EVENT_RECEIVE; } else - FCB->PollState &= ~AFD_EVENT_RECEIVE; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -242,7 +242,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); - return STATUS_CANCELLED; + return STATUS_CANCELLED; } FCB->Recv.Content = Irp->IoStatus.Information; @@ -252,9 +252,9 @@ AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; @@ -276,7 +276,7 @@ NTSTATUS NTAPI AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { + PIO_STACK_LOCATION IrpSp, BOOLEAN Short) { NTSTATUS Status = STATUS_INVALID_PARAMETER; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -292,29 +292,29 @@ AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, - Irp, 0, NULL ); + Irp, 0, NULL ); } if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { - AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); - return UnlockAndMaybeComplete( FCB, STATUS_NOT_IMPLEMENTED, - Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); + return UnlockAndMaybeComplete( FCB, STATUS_NOT_IMPLEMENTED, + Irp, 0, NULL ); } FCB->EventsFired &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, - Irp, 0, NULL ); + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, + Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, - NULL, NULL, - TRUE, FALSE ); + RecvReq->BufferCount, + NULL, NULL, + TRUE, FALSE ); if( !RecvReq->BufferArray ) { return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, @@ -353,79 +353,79 @@ static NTSTATUS NTAPI SatisfyPacketRecvRequest( PAFD_FCB FCB, PIRP Irp, - PAFD_STORED_DATAGRAM DatagramRecv, - PUINT TotalBytesCopied ) { + PAFD_STORED_DATAGRAM DatagramRecv, + PUINT TotalBytesCopied ) { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp ); PAFD_RECV_INFO RecvReq = - IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; UINT BytesToCopy = 0, BytesAvailable = DatagramRecv->Len, AddrLen = 0; PAFD_MAPBUF Map; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + - RecvReq->BufferCount + - EXTRA_LOCK_BUFFERS); + RecvReq->BufferCount + + EXTRA_LOCK_BUFFERS); BytesToCopy = - MIN( RecvReq->BufferArray[0].len, BytesAvailable ); + MIN( RecvReq->BufferArray[0].len, BytesAvailable ); AFD_DbgPrint(MID_TRACE,("BytesToCopy: %d len %d\n", BytesToCopy, - RecvReq->BufferArray[0].len)); + RecvReq->BufferArray[0].len)); if( Map[0].Mdl ) { - /* Copy the address */ - if( Map[1].Mdl && Map[2].Mdl ) { - AFD_DbgPrint(MID_TRACE,("Checking TAAddressCount\n")); - - if( DatagramRecv->Address->TAAddressCount != 1 ) { - AFD_DbgPrint - (MID_TRACE, - ("Wierd address count %d\n", - DatagramRecv->Address->TAAddressCount)); - } - - AFD_DbgPrint(MID_TRACE,("Computing addr len\n")); - - AddrLen = MIN(DatagramRecv->Address->Address->AddressLength + - sizeof(USHORT), - RecvReq->BufferArray[1].len); - - AFD_DbgPrint(MID_TRACE,("Copying %d bytes of address\n", AddrLen)); - - Map[1].BufferAddress = MmMapLockedPages( Map[1].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Done mapping, copying address\n")); - - RtlCopyMemory( Map[1].BufferAddress, - &DatagramRecv->Address->Address->AddressType, - AddrLen ); - - MmUnmapLockedPages( Map[1].BufferAddress, Map[1].Mdl ); - - AFD_DbgPrint(MID_TRACE,("Copying address len\n")); - - Map[2].BufferAddress = MmMapLockedPages( Map[2].Mdl, KernelMode ); - *((PINT)Map[2].BufferAddress) = AddrLen; - MmUnmapLockedPages( Map[2].BufferAddress, Map[2].Mdl ); - } - - AFD_DbgPrint(MID_TRACE,("Mapping data buffer pages\n")); - - Map[0].BufferAddress = MmMapLockedPages( Map[0].Mdl, KernelMode ); - - AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", - 0, - Map[0].BufferAddress, - BytesToCopy)); - - /* OskitDumpBuffer - ( FCB->Recv.Window + FCB->Recv.BytesUsed, BytesToCopy ); */ - - RtlCopyMemory( Map[0].BufferAddress, - FCB->Recv.Window + FCB->Recv.BytesUsed, - BytesToCopy ); - - MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); + /* Copy the address */ + if( Map[1].Mdl && Map[2].Mdl ) { + AFD_DbgPrint(MID_TRACE,("Checking TAAddressCount\n")); + + if( DatagramRecv->Address->TAAddressCount != 1 ) { + AFD_DbgPrint + (MID_TRACE, + ("Wierd address count %d\n", + DatagramRecv->Address->TAAddressCount)); + } + + AFD_DbgPrint(MID_TRACE,("Computing addr len\n")); + + AddrLen = MIN(DatagramRecv->Address->Address->AddressLength + + sizeof(USHORT), + RecvReq->BufferArray[1].len); + + AFD_DbgPrint(MID_TRACE,("Copying %d bytes of address\n", AddrLen)); + + Map[1].BufferAddress = MmMapLockedPages( Map[1].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Done mapping, copying address\n")); + + RtlCopyMemory( Map[1].BufferAddress, + &DatagramRecv->Address->Address->AddressType, + AddrLen ); + + MmUnmapLockedPages( Map[1].BufferAddress, Map[1].Mdl ); + + AFD_DbgPrint(MID_TRACE,("Copying address len\n")); + + Map[2].BufferAddress = MmMapLockedPages( Map[2].Mdl, KernelMode ); + *((PINT)Map[2].BufferAddress) = AddrLen; + MmUnmapLockedPages( Map[2].BufferAddress, Map[2].Mdl ); + } + + AFD_DbgPrint(MID_TRACE,("Mapping data buffer pages\n")); + + Map[0].BufferAddress = MmMapLockedPages( Map[0].Mdl, KernelMode ); + + AFD_DbgPrint(MID_TRACE,("Buffer %d: %x:%d\n", + 0, + Map[0].BufferAddress, + BytesToCopy)); + + /* OskitDumpBuffer + ( FCB->Recv.Window + FCB->Recv.BytesUsed, BytesToCopy ); */ + + RtlCopyMemory( Map[0].BufferAddress, + FCB->Recv.Window + FCB->Recv.BytesUsed, + BytesToCopy ); + + MmUnmapLockedPages( Map[0].BufferAddress, Map[0].Mdl ); *TotalBytesCopied = BytesToCopy; @@ -446,9 +446,9 @@ NTSTATUS NTAPI PacketSocketRecvComplete( - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) { + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context ) { NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = Context; PIRP NextIrp; @@ -468,105 +468,104 @@ FCB->ReceiveIrp.InFlightRequest = NULL; - if( Irp->Cancel ) { + if( Irp->IoStatus.Status == STATUS_CANCELLED ) { Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); - return STATUS_CANCELLED; + return STATUS_CANCELLED; } if( FCB->State == SOCKET_STATE_CLOSED ) { Irp->IoStatus.Status = STATUS_FILE_CLOSED; Irp->IoStatus.Information = 0; - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_FILE_CLOSED; + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_FILE_CLOSED; } DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); if( DatagramRecv ) { - DatagramRecv->Len = Irp->IoStatus.Information; - RtlCopyMemory( DatagramRecv->Buffer, FCB->Recv.Window, - DatagramRecv->Len ); - AFD_DbgPrint(MID_TRACE,("Received (A %x)\n", - FCB->AddressFrom->RemoteAddress)); - DatagramRecv->Address = - TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); - - if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; + DatagramRecv->Len = Irp->IoStatus.Information; + RtlCopyMemory( DatagramRecv->Buffer, FCB->Recv.Window, + DatagramRecv->Len ); + AFD_DbgPrint(MID_TRACE,("Received (A %x)\n", + FCB->AddressFrom->RemoteAddress)); + DatagramRecv->Address = + TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); + + if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - if( DatagramRecv ) ExFreePool( DatagramRecv ); - SocketStateUnlock( FCB ); - return Status; + if( DatagramRecv ) ExFreePool( DatagramRecv ); + SocketStateUnlock( FCB ); + return Status; } else { - InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); + InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); } /* Satisfy as many requests as we can */ while( !IsListEmpty( &FCB->DatagramList ) && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - AFD_DbgPrint(MID_TRACE,("Looping trying to satisfy request\n")); - ListEntry = RemoveHeadList( &FCB->DatagramList ); - DatagramRecv = CONTAINING_RECORD( ListEntry, AFD_STORED_DATAGRAM, - ListEntry ); - ListEntry = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_RECV] ); - NextIrp = CONTAINING_RECORD( ListEntry, IRP, Tail.Overlay.ListEntry ); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq: %x, DatagramRecv: %x\n", - RecvReq, DatagramRecv)); - - if( DatagramRecv->Len > RecvReq->BufferArray[0].len && - !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { - InsertHeadList( &FCB->DatagramList, - &DatagramRecv->ListEntry ); - Status = NextIrp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - NextIrp->IoStatus.Information = DatagramRecv->Len; - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + AFD_DbgPrint(MID_TRACE,("Looping trying to satisfy request\n")); + ListEntry = RemoveHeadList( &FCB->DatagramList ); + DatagramRecv = CONTAINING_RECORD( ListEntry, AFD_STORED_DATAGRAM, + ListEntry ); + ListEntry = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_RECV] ); + NextIrp = CONTAINING_RECORD( ListEntry, IRP, Tail.Overlay.ListEntry ); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq: %x, DatagramRecv: %x\n", + RecvReq, DatagramRecv)); + + if( DatagramRecv->Len > RecvReq->BufferArray[0].len && + !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { + InsertHeadList( &FCB->DatagramList, + &DatagramRecv->ListEntry ); + Status = NextIrp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + NextIrp->IoStatus.Information = DatagramRecv->Len; + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } else { - AFD_DbgPrint(MID_TRACE,("Satisfying\n")); - Status = SatisfyPacketRecvRequest - ( FCB, NextIrp, DatagramRecv, - (PUINT)&NextIrp->IoStatus.Information ); - AFD_DbgPrint(MID_TRACE,("Unlocking\n")); - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } else { + AFD_DbgPrint(MID_TRACE,("Satisfying\n")); + Status = SatisfyPacketRecvRequest + ( FCB, NextIrp, DatagramRecv, + (PUINT)&NextIrp->IoStatus.Information ); + AFD_DbgPrint(MID_TRACE,("Unlocking\n")); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); if ( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - AFD_DbgPrint(MID_TRACE,("Completing\n")); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } + AFD_DbgPrint(MID_TRACE,("Completing\n")); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } if( !IsListEmpty( &FCB->DatagramList ) ) { - AFD_DbgPrint(MID_TRACE,("Signalling\n")); - FCB->PollState |= AFD_EVENT_RECEIVE; + AFD_DbgPrint(MID_TRACE,("Signalling\n")); + FCB->PollState |= AFD_EVENT_RECEIVE; } else - FCB->PollState &= ~AFD_EVENT_RECEIVE; + FCB->PollState &= ~AFD_EVENT_RECEIVE; PollReeval( FCB->DeviceExt, FCB->FileObject ); if( NT_SUCCESS(Irp->IoStatus.Status) ) { - - /* Now relaunch the datagram request */ - Status = TdiReceiveDatagram - ( &FCB->ReceiveIrp.InFlightRequest, - FCB->AddressFile.Object, - 0, - FCB->Recv.Window, - FCB->Recv.Size, - FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, - PacketSocketRecvComplete, - FCB ); + /* Now relaunch the datagram request */ + Status = TdiReceiveDatagram + ( &FCB->ReceiveIrp.InFlightRequest, + FCB->AddressFile.Object, + 0, + FCB->Recv.Window, + FCB->Recv.Size, + FCB->AddressFrom, + &FCB->ReceiveIrp.Iosb, + PacketSocketRecvComplete, + FCB ); } SocketStateUnlock( FCB ); @@ -576,7 +575,7 @@ NTSTATUS NTAPI AfdPacketSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp ) { + PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -592,72 +591,72 @@ /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) - return UnlockAndMaybeComplete - ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); + return UnlockAndMaybeComplete + ( FCB, STATUS_INVALID_PARAMETER, Irp, 0, NULL ); if( !(RecvReq = LockRequest( Irp, IrpSp )) ) - return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + return UnlockAndMaybeComplete + ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, - RecvReq->Address, - RecvReq->AddressLength, - TRUE, TRUE ); + RecvReq->BufferCount, + RecvReq->Address, + RecvReq->AddressLength, + TRUE, TRUE ); if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete - ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); + ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); } if( !IsListEmpty( &FCB->DatagramList ) ) { - ListEntry = RemoveHeadList( &FCB->DatagramList ); - DatagramRecv = CONTAINING_RECORD - ( ListEntry, AFD_STORED_DATAGRAM, ListEntry ); - if( DatagramRecv->Len > RecvReq->BufferArray[0].len && - !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { - InsertHeadList( &FCB->DatagramList, - &DatagramRecv->ListEntry ); - Status = Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - Irp->IoStatus.Information = DatagramRecv->Len; - - if( IsListEmpty( &FCB->DatagramList ) ) - FCB->PollState &= ~AFD_EVENT_RECEIVE; - else - FCB->PollState |= AFD_EVENT_RECEIVE; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); - } else { - Status = SatisfyPacketRecvRequest - ( FCB, Irp, DatagramRecv, - (PUINT)&Irp->IoStatus.Information ); - - if( IsListEmpty( &FCB->DatagramList ) ) - FCB->PollState &= ~AFD_EVENT_RECEIVE; - else - FCB->PollState |= AFD_EVENT_RECEIVE; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); - } + ListEntry = RemoveHeadList( &FCB->DatagramList ); + DatagramRecv = CONTAINING_RECORD + ( ListEntry, AFD_STORED_DATAGRAM, ListEntry ); + if( DatagramRecv->Len > RecvReq->BufferArray[0].len && + !(RecvReq->TdiFlags & TDI_RECEIVE_PARTIAL) ) { + InsertHeadList( &FCB->DatagramList, + &DatagramRecv->ListEntry ); + Status = Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Information = DatagramRecv->Len; + + if( IsListEmpty( &FCB->DatagramList ) ) + FCB->PollState &= ~AFD_EVENT_RECEIVE; + else + FCB->PollState |= AFD_EVENT_RECEIVE; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + + return UnlockAndMaybeComplete + ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); + } else { + Status = SatisfyPacketRecvRequest + ( FCB, Irp, DatagramRecv, + (PUINT)&Irp->IoStatus.Information ); + + if( IsListEmpty( &FCB->DatagramList ) ) + FCB->PollState &= ~AFD_EVENT_RECEIVE; + else + FCB->PollState |= AFD_EVENT_RECEIVE; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + + return UnlockAndMaybeComplete + ( FCB, Status, Irp, Irp->IoStatus.Information, NULL ); + } } else if( RecvReq->AfdFlags & AFD_IMMEDIATE ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - Status = STATUS_CANT_WAIT; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + Status = STATUS_CANT_WAIT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else { - PollReeval( FCB->DeviceExt, FCB->FileObject ); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); - } -} + PollReeval( FCB->DeviceExt, FCB->FileObject ); + return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); + } +}

16 years, 4 months

[tkreuzer] 40187: [FORMATTING] Apply indentation of 4 spaces. Misc formatting improvements. Add some FIXME comments, no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 23 20:47:58 2009 New Revision: 40187 URL: http://svn.reactos.org/svn/reactos?rev=40187&view=rev Log: [FORMATTING] Apply indentation of 4 spaces. Misc formatting improvements. Add some FIXME comments, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/device.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

16 years, 4 months

[cfinck] 40186: - Start customizing some subsystems for RosCMS 4 and our new Backend server --> Bugzilla: Customized to the new config file path --> Shared: Fully customized --> Testman: Fully customized, ready for a test installation now :-) --> Wiki: Customized to the new config file path - Upgrade the MediaWiki config file to our used MediaWiki version - Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one - Add config file examples to the directories, which are also

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Mar 23 20:09:41 2009 New Revision: 40186 URL: http://svn.reactos.org/svn/reactos?rev=40186&view=rev Log: - Start customizing some subsystems for RosCMS 4 and our new Backend server --> Bugzilla: Customized to the new config file path --> Shared: Fully customized --> Testman: Fully customized, ready for a test installation now :-) --> Wiki: Customized to the new config file path - Upgrade the MediaWiki config file to our used MediaWiki version - Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one - Add config file examples to the directories, which are also used by the server, to make local testing easier Added: branches/danny-web/reactos.org/htdocs/testman/connect.db.php (with props) branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (with props) branches/danny-web/reactos.org/www.reactos.org_config/ (with props) branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (with props) branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (with props) branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (with props) Removed: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php Modified: branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php branches/danny-web/reactos.org/htdocs/testman/ajax-search.php branches/danny-web/reactos.org/htdocs/testman/compare.php branches/danny-web/reactos.org/htdocs/testman/config.inc.php branches/danny-web/reactos.org/htdocs/testman/detail.php branches/danny-web/reactos.org/htdocs/testman/index.php branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… branches/danny-web/reactos.org/htdocs/testman/webservice/index.php branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php branches/danny-web/reactos.org/htdocs/wiki/config/index.php branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png Modified: branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/bu… ============================================================================== --- branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -417,7 +417,7 @@ } # The "localconfig" file has another path on the ReactOS Web Server - $localconfig = "../../config/bugzilla-config"; + $localconfig = "../../www.reactos.org_config/bugzilla-config"; # We have to return absolute paths for mod_perl. # That means that if you modify these paths, they must be absolute paths. Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/sh… ============================================================================== --- branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -6,7 +6,7 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once(ROOT_PATH . "roscms/inc/utils.php"); + require_once(ROSCMS_PATH . "inc/utils.php"); function GetLanguage() { Modified: branches/danny-web/reactos.org/htdocs/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -13,6 +13,7 @@ require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); try @@ -40,15 +41,15 @@ $where .= "AND r.id >= " . (int)$_GET["startid"] . " "; if($_GET["user"]) - $where .= "AND u.user_name LIKE " . $dbh->quote($_GET["user"] . "%") . " "; + $where .= "AND a.name LIKE " . $dbh->quote($_GET["user"] . "%") . " "; if($_GET["platform"]) $where .= "AND r.platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " "; } // Prepare some clauses - $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id "; - $order = "ORDER BY revision ASC, id ASC "; + $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id "; + $order = "ORDER BY revision ASC, r.id ASC "; echo "<results>"; @@ -81,7 +82,7 @@ if($_GET["resultlist"]) { $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . $tables . $where . $order . "LIMIT " . RESULTS_PER_PAGE ) or die("<error>Query failed #2</error>"); @@ -100,7 +101,7 @@ echo "<result>"; printf("<id>%d</id>", $row["id"]); printf("<date>%s</date>", GetDateString($row["timestamp"])); - printf("<user>%s</user>", htmlspecialchars($row["user_name"])); + printf("<user>%s</user>", htmlspecialchars($row["name"])); printf("<revision>%d</revision>", $row["revision"]); printf("<platform>%s</platform>", GetPlatformString($row["platform"])); printf("<comment>%s</comment>", htmlspecialchars($row["comment"])); Modified: branches/danny-web/reactos.org/htdocs/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -8,12 +8,11 @@ charset=utf-8 without BOM */ - define("ROOT_PATH", "../"); - require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(SHARED_PATH . "subsys_layout.php"); GetLanguage(); require_once("lang/$lang.inc.php"); @@ -166,10 +165,10 @@ printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]); $stmt = $dbh->prepare( - "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform " . "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . - "WHERE r.id = :id" + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . + "WHERE r.id = :id" ); foreach($id_array as $id) @@ -179,7 +178,7 @@ $row = $stmt->fetch(PDO::FETCH_ASSOC); echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; - printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["user_name"], GetPlatformString($row["platform"])); + printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["name"], GetPlatformString($row["platform"])); echo '</th>'; } Modified: branches/danny-web/reactos.org/htdocs/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -2,20 +2,13 @@ /* PROJECT: ReactOS Web Test Manager LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - PURPOSE: Configuration settings + PURPOSE: Configuration settings for the Web Interface COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - - // DB Settings - // The user entered here must have: - // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN - // * SELECT privileges to $DB_ROSCMS - define("DB_HOST", "localhost"); - define("DB_USER", "root"); - define("DB_PASS", ""); - - define("DB_ROSCMS", "roscms"); - define("DB_TESTMAN", "testman"); + + define("ROSCMS_PATH", "../roscms/"); + define("SHARED_PATH", "../shared/"); + define("TESTMAN_PATH", ""); define("RESULTS_PER_PAGE", 100); define("MAX_COMPARE_RESULTS", 5); Added: branches/danny-web/reactos.org/htdocs/testman/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/connect.db.php (added) +++ branches/danny-web/reactos.org/htdocs/testman/connect.db.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,10 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Database Configuration Settings + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + require_once(TESTMAN_PATH . "../../www.reactos.org_config/testman-connect.php"); +?> Propchange: branches/danny-web/reactos.org/htdocs/testman/connect.db.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/reactos.org/htdocs/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,13 +7,12 @@ charset=utf-8 without BOM */ - - define("ROOT_PATH", "../"); require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(SHARED_PATH . "subsys_layout.php"); GetLanguage(); require_once("lang/$lang.inc.php"); @@ -53,11 +52,11 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name, r.comment " . + "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . "JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . "WHERE e.id = :id" ); $stmt->bindParam(":id", $_GET["id"]); @@ -111,7 +110,7 @@ </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["user"]; ?>:</td> - <td><?php echo $row["user_name"]; ?></td> + <td><?php echo $row["name"]; ?></td> </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["platform"]; ?>:</td> Modified: branches/danny-web/reactos.org/htdocs/testman/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,17 +7,16 @@ charset=utf-8 without BOM */ - - define("ROOT_PATH", "../"); require_once("config.inc.php"); + require_once("connect.db.php"); require_once("utils.inc.php"); require_once("languages.inc.php"); - require_once(ROOT_PATH . "shared/subsys_layout.php"); - require_once(ROOT_PATH . "shared/svn.php"); + require_once(SHARED_PATH . "subsys_layout.php"); + require_once(SHARED_PATH . "svn.php"); GetLanguage(); - require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); + require_once(SHARED_PATH . "lang/$lang.inc.php"); require_once("lang/$lang.inc.php"); $rev = GetLatestRevision(); @@ -113,10 +112,10 @@ } $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . - "ORDER BY revision DESC, id DESC " . + "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " . + "ORDER BY revision DESC, r.id DESC " . "LIMIT 10" ) or die("Query failed #1"); @@ -131,7 +130,7 @@ printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["user_name"])); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["name"])); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"])); printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["comment"])); echo "</tr>"; Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregato… [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -5,8 +5,9 @@ PURPOSE: Aggregator for the Debug Log of ReactOS BuildBot Buildslaves COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> */ - - require_once("../config.inc.php"); + + require_once("config.inc.php"); + require_once(TESTMAN_PATH . "connect.db.php"); require_once("utils.inc.php"); if(!isset($_GET["username"]) || !isset($_GET["password"]) || !isset($_GET["slavename"]) || !is_numeric($_GET["platform"]) || !is_numeric($_GET["build"])) Added: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (added) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,10 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Configuration settings for the Web Service + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + define("TESTMAN_PATH", "../"); +?> Propchange: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -6,7 +6,8 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ - require_once("../config.inc.php"); + require_once("config.inc.php"); + require_once(TESTMAN_PATH . "connect.db.php"); require_once("utils.inc.php"); if(!isset($_POST["username"]) || !isset($_POST["password"]) || !isset($_POST["testtype"])) Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/te… ============================================================================== --- branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -26,7 +26,7 @@ global $dbh; // Check the login credentials - $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'"); + $stmt = $dbh->prepare("SELECT id FROM " . DB_ROSCMS . ".roscms_accounts WHERE name = :username AND password = MD5(:password) AND disabled = 0"); $stmt->bindParam(":username", $username); $stmt->bindParam(":password", $password); $stmt->execute() or die("SQL failed #1"); Modified: branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -7,6 +7,9 @@ # See includes/DefaultSettings.php for all configurable settings # and their default values, but don't forget to make changes in _this_ # file, not there. +# +# Further documentation for configuration settings may be found at: +# http://www.mediawiki.org/wiki/Manual:Configuration_settings # If you customize your file layout, set $IP to the directory that contains # the other MediaWiki files. It will be used as a base to locate files. @@ -19,7 +22,7 @@ $path = array( $IP, "$IP/includes", "$IP/languages" ); set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() ); -require_once( "includes/DefaultSettings.php" ); +require_once( "$IP/includes/DefaultSettings.php" ); # If PHP's memory limit is very low, some operations may fail. # ini_set( 'memory_limit', '20M' ); @@ -28,65 +31,59 @@ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) { die( "This script must be run from the command line\n" ); } -} elseif ( empty( $wgNoOutputBuffer ) ) { - ## Compress output if the browser supports it - if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' ); } +## Uncomment this to disable output compression +# $wgDisableOutputCompression = true; $wgSitename = "ReactOS"; -$wgScriptPath = "/wiki"; -$wgScript = "$wgScriptPath/index.php"; -$wgRedirectScript = "$wgScriptPath/redirect.php"; +## The URL base path to the directory containing the wiki; +## defaults for all runtime URL paths are based off of this. +## For more information on customizing the URLs please see: +## http://www.mediawiki.org/wiki/Manual:Short_URL +$wgScriptPath = "/wiki"; +$wgScriptExtension = ".php"; -## For more information on customizing the URLs please see: -## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url -## If using PHP as a CGI module, the ?title= style usually must be used. -$wgArticlePath = "$wgScript/$1"; -# $wgArticlePath = "$wgScript?title=$1"; +$wgArticlePath = "$wgScriptPath/$1"; +$wgStylePath = "$wgScriptPath/skins"; -$wgStylePath = "$wgScriptPath/skins"; -$wgStyleDirectory = "$IP/skins"; -$wgLogo = "$wgStylePath/common/images/reactos.png"; +## UPO means: this is also a user preference option -$wgUploadPath = "$wgScriptPath/images"; -$wgUploadDirectory = "$IP/images"; - -$wgEnableEmail = true; -$wgEnableUserEmail = true; +$wgEnableEmail = true; +$wgEnableUserEmail = true; # UPO $wgEmergencyContact = "ros-web(a)reactos.org"; -$wgPasswordSender = "ros-web(a)reactos.org"; +$wgPasswordSender = "ros-web(a)reactos.org"; -## For a detailed description of the following switches see -## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent -## There are many more options for fine tuning available see -## /includes/DefaultSettings.php -## UPO means: this is also a user preference option $wgEnotifUserTalk = true; # UPO $wgEnotifWatchlist = true; # UPO $wgEmailAuthentication = false; -# Uncomment one of the following lines based on whether the Wiki runs on the ReactOS Server or locally -require_once("/web/reactos.org/config/wiki-connect.php"); -//require_once("$IP/wiki-connect.php"); +require_once("$IP/../../www.reactos.org_config/wiki-connect.php"); -# Use the hash preprocessor for our server -$wgParserConf["preprocessorClass"] = "Preprocessor_Hash"; +# MySQL specific settings +$wgDBprefix = ""; + +# MySQL table options to use during installation or update +$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary"; # Experimental charset support for MySQL 4.1/5.0. -$wgDBmysql5 = false; +$wgDBmysql5 = true; ## Shared memory settings $wgMainCacheType = CACHE_NONE; $wgMemCachedServers = array(); ## To enable image uploads, make sure the 'images' directory -## is writable, then uncomment this: -$wgEnableUploads = true; -$wgUseImageResize = true; +## is writable, then set this to true: +$wgEnableUploads = true; $wgUseImageMagick = true; $wgImageMagickConvertCommand = "/usr/bin/convert"; + +## If you use ImageMagick (or any other shell command) on a +## Linux server, this will need to be set to the name of an +## available UTF-8 locale +$wgShellLocale = "en_US.UTF-8"; ## If you want to use image uploads under safe mode, ## create the directories images/archive, images/thumb and @@ -96,10 +93,7 @@ ## If you have the appropriate support software installed ## you can enable inline LaTeX equations: -# $wgUseTeX = true; -$wgMathPath = "{$wgUploadPath}/math"; -$wgMathDirectory = "{$wgUploadDirectory}/math"; -$wgTmpDirectory = "{$wgUploadDirectory}/tmp"; +$wgUseTeX = false; $wgLocalInterwiki = $wgSitename; @@ -114,7 +108,7 @@ ## For attaching licensing metadata to pages, and displaying an ## appropriate copyright notice / icon. GNU Free Documentation ## License and Creative Commons licenses are supported so far. -$wgEnableCreativeCommonsRdf = true; +# $wgEnableCreativeCommonsRdf = true; $wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright $wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html"; $wgRightsText = "GNU Free Documentation License 1.2"; @@ -125,8 +119,7 @@ # When you make changes to this configuration file, this will make # sure that cached pages are cleared. -$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) ); -$wgCacheEpoch = max( $wgCacheEpoch, $configdate ); +$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) ); # Entirely disable Anonymous Edits $wgGroupPermissions['*']['edit'] = false; @@ -142,9 +135,6 @@ $wgGroupPermissions['supermod']['undelete'] = true; $wgGroupPermissions['supermod']['rollback'] = true; -# deactivate DB SQL queries -$wgAllowSysopQueries = false; - # Enable external image embedding $wgAllowExternalImages = true; @@ -153,5 +143,3 @@ # RosCMS-specific settings define("ROSCMS_PATH", "$IP/../roscms/"); - -?> Modified: branches/danny-web/reactos.org/htdocs/wiki/config/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -22,6 +22,8 @@ error_reporting( E_ALL ); header( "Content-type: text/html; charset=utf-8" ); @ini_set( "display_errors", true ); + +define("ROSCMS_PATH", "../../roscms/"); # In case of errors, let output be clean. $wgRequestTime = microtime( true ); Removed: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== Binary file - no diff available. Modified: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== Binary files - no diff available. Removed: branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wi… ============================================================================== --- branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php (removed) @@ -1,10 +1,0 @@ -<?php - // Settings for a local MediaWiki installation - $wgDBserver = "localhost"; - $wgDBname = "wiki"; - $wgDBuser = "rosuser"; - $wgDBpassword = "roscms"; - $wgDBprefix = ""; - $wgDBtype = "mysql"; - $wgDBport = "5432"; -?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 23 20:09:41 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/danny-web/reactos.org/www.reactos.org_config/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,90 @@ + +# If you are using Apache as your web server, Bugzilla can create .htaccess +# files for you that will instruct Apache not to serve files that shouldn't +# be accessed from the web (like your local configuration data and non-cgi +# executable files). For this to work, the directory your Bugzilla +# installation is in must be within the jurisdiction of a <Directory> block +# in the httpd.conf file that has 'AllowOverride Limit' in it. If it has +# 'AllowOverride All' or other options with Limit, that's fine. +# (Older Apache installations may use an access.conf file to store these +# <Directory> blocks.) +# If this is set to 1, Bugzilla will create these files if they don't exist. +# If this is set to 0, Bugzilla will not create these files. +$create_htaccess = 1; + +# This is the group your web server runs as. +# If you have a Windows box, ignore this setting. +# If you do not have access to the group your web server runs under, +# set this to "". If you do set this to "", then your Bugzilla installation +# will be _VERY_ insecure, because some files will be world readable/writable, +# and so anyone who can get local access to your machine can do whatever they +# want. You should only have this set to "" if this is a testing installation +# and you cannot set this up any other way. YOU HAVE BEEN WARNED! +# If you set this to anything other than "", you will need to run checksetup.pl +# asAdministrator, or as a user who is a member of the specified group. +$webservergroup = ''; + +# What SQL database to use. Default is mysql. List of supported databases +# can be obtained by listing Bugzilla/DB directory - every module corresponds +# to one supported database and the name corresponds to a driver name. +$db_driver = 'mysql'; + +# The DNS name of the host that the database server runs on. +$db_host = 'localhost'; + +# The name of the database +$db_name = 'bugs'; + +# Who we connect to the database as. +$db_user = 'root'; + +# Enter your database password here. It's normally advisable to specify +# a password for your bugzilla database user. +# If you use apostrophe (') or a backslash (\) in your password, you'll +# need to escape it by preceding it with a '\' character. (\') or (\) +# (Far simpler just not to use those characters.) +$db_pass = ''; + +# Sometimes the database server is running on a non-standard port. If that's +# the case for your database server, set this to the port number that your +# database server is running on. Setting this to 0 means "use the default +# port for my database server." +$db_port = 0; + +# MySQL Only: Enter a path to the unix socket for MySQL. If this is +# blank, then MySQL's compiled-in default will be used. You probably +# want that. +$db_sock = ''; + +# Should checksetup.pl try to verify that your database setup is correct? +# (with some combinations of database servers/Perl modules/moonphase this +# doesn't work) +$db_check = 1; + +# With the introduction of a configurable index page using the +# template toolkit, Bugzilla's main index page is now index.cgi. +# Most web servers will allow you to use index.cgi as a directory +# index, and many come preconfigured that way, but if yours doesn't +# then you'll need an index.html file that provides redirection +# to index.cgi. Setting $index_html to 1 below will allow +# checksetup.pl to create one for you if it doesn't exist. +# NOTE: checksetup.pl will not replace an existing file, so if you +# wish to have checksetup.pl create one for you, you must +# make sure that index.html doesn't already exist +$index_html = 0; + +# For some optional functions of Bugzilla (such as the pretty-print patch +# viewer), we need the cvs binary to access files and revisions. +# Because it's possible that this program is not in your path, you can specify +# its location here. Please specify the full path to the executable. +$cvsbin = ''; + +# For some optional functions of Bugzilla (such as the pretty-print patch +# viewer), we need the interdiff binary to make diffs between two patches. +# Because it's possible that this program is not in your path, you can specify +# its location here. Please specify the full path to the executable. +$interdiffbin = ''; + +# The interdiff feature needs diff, so we have to have that path. +# Please specify the directory name only; do not use trailing slash. +$diffpath = ''; Propchange: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,12 @@ +<?php + // DB Settings + // The user entered here must have: + // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN + // * SELECT privileges to $DB_ROSCMS + define("DB_HOST", "localhost"); + define("DB_USER", "root"); + define("DB_PASS", ""); + + define("DB_ROSCMS", "roscms"); + define("DB_TESTMAN", "testman"); +?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.react… ============================================================================== --- branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (added) +++ branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009 @@ -1,0 +1,7 @@ +<?php + // Settings for a local MediaWiki installation + $wgDBserver = "localhost"; + $wgDBname = "wiki"; + $wgDBuser = "root"; + $wgDBpassword = ""; +?> Propchange: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs