Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35062: - Handle STATUS_REMOTE_NOT_LISTENING
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 04:52:22 2008 New Revision: 35062 URL: http://svn.reactos.org/svn/reactos?rev=35062&view=rev Log: - Handle STATUS_REMOTE_NOT_LISTENING Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 3 04:52:22 2008 @@ -288,6 +288,7 @@ case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; + case STATUS_REMOTE_NOT_LISTENING: *Errno = WSAECONNRESET; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break;

1 0

[cgutman] 35061: - Handle STATUS_INSUFFICIENT_RESOURCES
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 04:40:13 2008 New Revision: 35061 URL: http://svn.reactos.org/svn/reactos?rev=35061&view=rev Log: - Handle STATUS_INSUFFICIENT_RESOURCES Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 3 04:40:13 2008 @@ -286,6 +286,7 @@ case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; + case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status);

1 0

[pschweitzer] 35060: Fixed French translation for cacls by Amine Khaldi
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 04:18:24 2008 New Revision: 35060 URL: http://svn.reactos.org/svn/reactos?rev=35060&view=rev Log: Fixed French translation for cacls by Amine Khaldi Modified: trunk/reactos/base/applications/cacls/lang/fr-FR.rc Modified: trunk/reactos/base/applications/cacls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/fr-FR.rc [iso-8859-1] Sun Aug 3 04:18:24 2008 @@ -7,17 +7,17 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ [/P user:perm [...]] [/D user [...]]\n\ nomfichier Affiche les ACLs du fichier.\n\ - /T Change les ACLs des fichiers specifiés dans\n\ + /T Change les ACLs des fichiers spécifiés dans\n\ le répertoire en cours et tous les sous-répertoires.\n\ /E Édite les ACL au lieu de les remplacer.\n\ /C Continuer en cas de refus d'accès.\n\ - /G user:perm Accorder des droit d'accès à l'utilisateur spécifié.\n\ + /G user:perm Accorder des droits d'accès à l'utilisateur spécifié.\n\ Perm peut valoir : R Lecture\n\ W Écriture\n\ C Modification (Écriture)\n\ F Contrôle total\n\ /R user Supprime les droits d'accès de l'utilisateur spécifié (valide uniquement avec /E).\n\ - /P user:perm Remplace les droits d'accès de l'utilisateur specifié.\n\ + /P user:perm Remplace les droits d'accès de l'utilisateur spécifié.\n\ Perm peut valoir : N Aucun \n\ R Lecture\n\ W Écriture\n\ @@ -27,11 +27,11 @@ Il est possible d'utiliser des caractères joker pour sélectionner plus d'un fichier avec une commande.\n\ Il est possible de spécifier plus d'un utilisateur dans une commande.\n\n\ Abréviations:\n\ - CI - Heritage du conteneur.\n\ + CI - Héritage du conteneur.\n\ Le ACE sera appliqué aux répertoires.\n\ OI - Héritage de l'objet.\n\ Le ACE sera appliqué aux fichiers.\n\ - IO - Heritage seul.\n\ + IO - Héritage seul.\n\ Le ACE ne sera pas appliqué au fichier/répertoire actuel.\n" IDS_ABBR_CI, "(CI)"

1 0

[sginsberg] 35059: - Use RtlCopyUnicodeString instead of RtlInitUnicodeString when copying a string
by sginsberg＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: sginsberg Date: Sun Aug 3 03:53:27 2008 New Revision: 35059 URL: http://svn.reactos.org/svn/reactos?rev=35059&view=rev Log: - Use RtlCopyUnicodeString instead of RtlInitUnicodeString when copying a string Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sun Aug 3 03:53:27 2008 @@ -354,7 +354,7 @@ CacheEntry->FileName.Buffer = ExAllocatePoolWithTag(NonPagedPool, FileName->Length, TAG_KDBS); - RtlInitUnicodeString(&CacheEntry->FileName, FileName->Buffer); + RtlCopyUnicodeString(&CacheEntry->FileName, FileName); ASSERT(CacheEntry->FileName.Buffer); CacheEntry->RefCount = 1; CacheEntry->RosSymInfo = RosSymInfo;

1 0

[pschweitzer] 35058: Fixed rosapps build
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 03:38:59 2008 New Revision: 35058 URL: http://svn.reactos.org/svn/reactos?rev=35058&view=rev Log: Fixed rosapps build Added: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff (with props) Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -40,8 +40,8 @@ @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) @ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) -@ stub SymEnumSymbolsForAddr -@ stub SymEnumSymbolsForAddrW +@ stdcall SymEnumSymbolsForAddr (ptr double ptr ptr) +@ stdcall SymEnumSymbolsForAddrW (ptr double ptr ptr) @ stdcall SymEnumTypes(ptr double ptr ptr) @ stdcall SymEnumTypesW(ptr double ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) Added: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff (added) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -1,0 +1,50 @@ +Index: dbghelp.spec +=================================================================== +--- dbghelp.spec (revision 35049) ++++ dbghelp.spec (working copy) +@@ -40,8 +40,8 @@ + @ stub SymEnumSym + @ stdcall SymEnumSymbols(ptr double str ptr ptr) + @ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) +-@ stub SymEnumSymbolsForAddr +-@ stub SymEnumSymbolsForAddrW ++@ stdcall SymEnumSymbolsForAddr (ptr double ptr ptr) ++@ stdcall SymEnumSymbolsForAddrW (ptr double ptr ptr) + @ stdcall SymEnumTypes(ptr double ptr ptr) + @ stdcall SymEnumTypesW(ptr double ptr ptr) + @ stdcall SymEnumerateModules(long ptr ptr) +Index: symbol.c +=================================================================== +--- symbol.c (revision 35049) ++++ symbol.c (working copy) +@@ -1000,6 +1000,30 @@ + } + + /****************************************************************** ++ * SymEnumSymbolsForAddrW (DBGHELP.@) ++ * ++ */ ++BOOL WINAPI SymEnumSymbolsForAddrW(HANDLE hProcess, DWORD64 Address, ++ PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, ++ PVOID UserContext) ++{ ++ UNIMPLEMENTED; ++ return FALSE; ++} ++ ++/****************************************************************** ++ * SymEnumSymbolsForAddr (DBGHELP.@) ++ * ++ */ ++BOOL WINAPI SymEnumSymbolsForAddr(HANDLE hProcess, DWORD64 Address, ++ PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, ++ PVOID UserContext) ++{ ++ UNIMPLEMENTED; ++ return FALSE; ++} ++ ++/****************************************************************** + * SymEnumSymbolsW (DBGHELP.@) + * + */ Propchange: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -1000,6 +1000,30 @@ } /****************************************************************** + * SymEnumSymbolsForAddrW (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSymbolsForAddrW(HANDLE hProcess, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + PVOID UserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +/****************************************************************** + * SymEnumSymbolsForAddr (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSymbolsForAddr(HANDLE hProcess, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +/****************************************************************** * SymEnumSymbolsW (DBGHELP.@) * */ Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -375,10 +375,9 @@ #define SYMOPT_EXACT_SYMBOLS 0x00000400 #define SYMOPT_WILD_UNDERSCORE 0x00000800 #define SYMOPT_USE_DEFAULTS 0x00001000 -/* latest SDK defines: +/* latest SDK defines: */ #define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800 #define SYMOPT_IGNORE_NT_SYMPATH 0x00001000 -*/ #define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000 #define SYMOPT_PUBLICS_ONLY 0x00004000 #define SYMOPT_NO_PUBLICS 0x00008000

1 0

[sginsberg] 35057: - Revert 35042
by sginsberg＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: sginsberg Date: Sun Aug 3 03:18:54 2008 New Revision: 35057 URL: http://svn.reactos.org/svn/reactos?rev=35057&view=rev Log: - Revert 35042 Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sun Aug 3 03:18:54 2008 @@ -35,10 +35,8 @@ ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable, IN EXHANDLE LookupHandle) { - ULONG i, j, k, NextHandle; - ULONG_PTR TableCode = HandleTable->TableCode; - ULONG_PTR TableBase = TableCode & ~3; - ULONG TableLevel = (ULONG)(TableCode & 3); + ULONG i, j, k, TableLevel, NextHandle; + ULONG_PTR TableBase; PHANDLE_TABLE_ENTRY Entry = NULL; EXHANDLE Handle = LookupHandle; PUCHAR Level1, Level2, Level3; @@ -47,6 +45,13 @@ Handle.TagBits = 0; NextHandle = *(volatile ULONG*)&HandleTable->NextHandleNeedingPool; if (Handle.Value >= NextHandle) return NULL; + + /* Get the table code */ + TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; + + /* Extract the table level and actual table base */ + TableLevel = (ULONG)(TableBase & 3); + TableBase = TableBase - TableLevel; /* Check what level we're running at */ switch (TableLevel) @@ -205,8 +210,8 @@ PEPROCESS Process = HandleTable->QuotaProcess; ULONG i, j; ULONG_PTR TableCode = HandleTable->TableCode; + ULONG TableLevel = TableCode & 3; ULONG_PTR TableBase = TableCode & ~3; - ULONG TableLevel = (ULONG)(TableCode & 3); PHANDLE_TABLE_ENTRY Level1, *Level2, **Level3; PAGED_CODE(); @@ -728,13 +733,6 @@ /* Lookup the entry for this handle */ Entry = ExpLookupHandleTableEntry(HandleTable, Handle); - - /* Make sure that we found an entry */ - if (!Entry) - { - /* We didn't, fail */ - return NULL; - } /* Get an available lock and acquire it */ i = ((OldValue & FREE_HANDLE_MASK) >> 2) % 4;

1 0

[arty] 35056: Merge aicom-network-fixes up to 35055
by arty＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: arty Date: Sun Aug 3 02:23:42 2008 New Revision: 35056 URL: http://svn.reactos.org/svn/reactos?rev=35056&view=rev Log: Merge aicom-network-fixes up to 35055 Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/drivers/network/tcpip/tcpip/pool.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -18,7 +18,10 @@ PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; - if( !SocketAcquireStateLock( FCB ) ) return; + if( !SocketAcquireStateLock( FCB ) ) { + LostSocket( Irp ); + return; + } /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); 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] Sun Aug 3 02:23:42 2008 @@ -237,6 +237,9 @@ UINT Information, PIO_COMPLETION_ROUTINE Completion ) { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + if( Status == STATUS_PENDING ) { /* We should firstly mark this IRP as pending, because otherwise it may be completed by StreamSocketConnectComplete() @@ -246,8 +249,6 @@ } else { if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); SocketStateUnlock( FCB ); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; if( Completion ) Completion( FCB->DeviceExt->DeviceObject, Irp, FCB ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -313,6 +313,8 @@ ASSERT(FileObject == IrpSp->FileObject); } + Irp->IoStatus.Information = 0; + switch(IrpSp->MajorFunction) { /* opening and closing handles to the device */ @@ -457,7 +459,6 @@ default: Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; AFD_DbgPrint(MIN_TRACE, ("Unknown IOCTL (0x%x)\n", IrpSp->Parameters.DeviceIoControl. IoControlCode)); 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] Sun Aug 3 02:23:42 2008 @@ -129,7 +129,7 @@ PIRP NextIrp; PIO_STACK_LOCATION NextIrpSp; PAFD_RECV_INFO RecvReq; - UINT TotalBytesCopied = 0; + UINT TotalBytesCopied = 0, RetBytesCopied = 0; NTSTATUS Status = STATUS_SUCCESS, RetStatus = STATUS_PENDING; AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); @@ -197,7 +197,10 @@ RecvReq->BufferCount, FALSE ); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) RetStatus = Status; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -212,6 +215,12 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); AFD_DbgPrint(MID_TRACE,("RetStatus for irp %x is %x\n", Irp, RetStatus)); + + /* Sometimes we're called with a NULL Irp */ + if( Irp ) { + Irp->IoStatus.Status = RetStatus; + Irp->IoStatus.Information = RetBytesCopied; + } return RetStatus; } Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -262,6 +262,8 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + Irp->IoStatus.Status = Status; + return Status; } Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -860,8 +860,10 @@ Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, Kbio, KbioLength, &ResultLength ); - TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); - return Status; + if( !NT_SUCCESS(Status) ) { + TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); + return Status; + } } if( NT_SUCCESS(Status) ) { Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -518,6 +518,8 @@ if( Complete ) IRPFinish( Irp, Status ); + else + Irp->IoStatus.Status = Status; return Status; } Modified: trunk/reactos/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] Sun Aug 3 02:23:42 2008 @@ -48,11 +48,20 @@ } PVOID TcpipAllocateFromNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List ) { - return ExAllocateFromNPagedLookasideList( List ); + PVOID Buffer; + + Buffer = ExAllocateFromNPagedLookasideList( List ); + + TI_DbgPrint(DEBUG_MEMORY, ("Allocated from Nonpaged Lookaside List at (0x%X).\n", Buffer)); + + return Buffer; } VOID TcpipFreeToNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List, PVOID Thing ) { + + TI_DbgPrint(DEBUG_MEMORY, ("Freeing buffer (0x%X) to Nonpaged Lookaside List.\n", Thing)); + ExFreeToNPagedLookasideList( List, Thing ); }

1 0

[cgutman] 35055: - Check to see if the ZwEnumerateKey call succeeded with the larger buffer and continue if possible
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 00:10:53 2008 New Revision: 35055 URL: http://svn.reactos.org/svn/reactos?rev=35055&view=rev Log: - Check to see if the ZwEnumerateKey call succeeded with the larger buffer and continue if possible Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Aug 3 00:10:53 2008 @@ -860,8 +860,10 @@ Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, Kbio, KbioLength, &ResultLength ); - TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); - return Status; + if( !NT_SUCCESS(Status) ) { + TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); + return Status; + } } if( NT_SUCCESS(Status) ) {

1 0

[cgutman] 35054: - Add some more debug prints for memory allocation/freeing
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sat Aug 2 22:05:39 2008 New Revision: 35054 URL: http://svn.reactos.org/svn/reactos?rev=35054&view=rev Log: - Add some more debug prints for memory allocation/freeing Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] Sat Aug 2 22:05:39 2008 @@ -48,11 +48,20 @@ } PVOID TcpipAllocateFromNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List ) { - return ExAllocateFromNPagedLookasideList( List ); + PVOID Buffer; + + Buffer = ExAllocateFromNPagedLookasideList( List ); + + TI_DbgPrint(DEBUG_MEMORY, ("Allocated from Nonpaged Lookaside List at (0x%X).\n", Buffer)); + + return Buffer; } VOID TcpipFreeToNPagedLookasideList( PNPAGED_LOOKASIDE_LIST List, PVOID Thing ) { + + TI_DbgPrint(DEBUG_MEMORY, ("Freeing buffer (0x%X) to Nonpaged Lookaside List.\n", Thing)); + ExFreeToNPagedLookasideList( List, Thing ); }

1 0

[cgutman] 35053: - We must assign values to Irp->IoStatus.Status and Irp->IoStatus.Information because the function that called us might not call UnlockAndMaybeComplete to assign those values
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sat Aug 2 20:38:05 2008 New Revision: 35053 URL: http://svn.reactos.org/svn/reactos?rev=35053&view=rev Log: - We must assign values to Irp->IoStatus.Status and Irp->IoStatus.Information because the function that called us might not call UnlockAndMaybeComplete to assign those values Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sat Aug 2 20:38:05 2008 @@ -129,7 +129,7 @@ PIRP NextIrp; PIO_STACK_LOCATION NextIrpSp; PAFD_RECV_INFO RecvReq; - UINT TotalBytesCopied = 0; + UINT TotalBytesCopied = 0, RetBytesCopied = 0; NTSTATUS Status = STATUS_SUCCESS, RetStatus = STATUS_PENDING; AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); @@ -197,7 +197,10 @@ RecvReq->BufferCount, FALSE ); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) RetStatus = Status; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } @@ -212,6 +215,12 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); AFD_DbgPrint(MID_TRACE,("RetStatus for irp %x is %x\n", Irp, RetStatus)); + + /* Sometimes we're called with a NULL Irp */ + if( Irp ) { + Irp->IoStatus.Status = RetStatus; + Irp->IoStatus.Information = RetBytesCopied; + } return RetStatus; }

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
86
Older →

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 August 2008